Skip to content

Commit 3175dbc

Browse files
committed
Add support dhcpcd NOCARRIER_ROAMING
1 parent 0c3e1cd commit 3175dbc

File tree

2 files changed

+30
-24
lines changed

2 files changed

+30
-24
lines changed

src/libdhcpcd/dhcpcd.c

Lines changed: 28 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -85,29 +85,30 @@ struct dhcpcd_vs {
8585
};
8686

8787
static const struct dhcpcd_vs dhcpcd_states[] = {
88-
{ DHS_DUMP, "DUMP" },
89-
{ DHS_TEST, "TEST" },
90-
{ DHS_STOPPED, "STOPPED" },
91-
{ DHS_FAIL, "FAIL" },
92-
{ DHS_STOP, "STOP" },
93-
{ DHS_PREINIT, "PREINIT" },
94-
{ DHS_DEPARTED, "DEPARTED" },
95-
{ DHS_NOCARRIER, "NOCARRIER" },
96-
{ DHS_NAK, "NAK" },
97-
{ DHS_EXPIRE, "EXPIRE" },
98-
{ DHS_RECONFIGURE, "RECONFIGURE" },
99-
{ DHS_CARRIER, "CARRIER" },
100-
{ DHS_STATIC, "STATIC" },
101-
{ DHS_3RDPARTY, "3RDPARTY" },
102-
{ DHS_IPV4LL, "IPV4LL" },
103-
{ DHS_INFORM, "INFORM" },
104-
{ DHS_BOUND, "BOUND" },
105-
{ DHS_RENEW, "RENEW" },
106-
{ DHS_REBIND, "REBIND" },
107-
{ DHS_REBOOT, "REBOOT" },
108-
{ DHS_ROUTERADVERT, "ROUTERADVERT" },
109-
{ DHS_BOUND, "DELEGATED" },
110-
{ DHS_UNKNOWN, NULL }
88+
{ DHS_DUMP, "DUMP" },
89+
{ DHS_TEST, "TEST" },
90+
{ DHS_STOPPED, "STOPPED" },
91+
{ DHS_FAIL, "FAIL" },
92+
{ DHS_STOP, "STOP" },
93+
{ DHS_PREINIT, "PREINIT" },
94+
{ DHS_DEPARTED, "DEPARTED" },
95+
{ DHS_NOCARRIER, "NOCARRIER" },
96+
{ DHS_NOCARRIER_ROAMING, "NOCARRIER_ROAMING " },
97+
{ DHS_NAK, "NAK" },
98+
{ DHS_EXPIRE, "EXPIRE" },
99+
{ DHS_RECONFIGURE, "RECONFIGURE" },
100+
{ DHS_CARRIER, "CARRIER" },
101+
{ DHS_STATIC, "STATIC" },
102+
{ DHS_3RDPARTY, "3RDPARTY" },
103+
{ DHS_IPV4LL, "IPV4LL" },
104+
{ DHS_INFORM, "INFORM" },
105+
{ DHS_BOUND, "BOUND" },
106+
{ DHS_RENEW, "RENEW" },
107+
{ DHS_REBIND, "REBIND" },
108+
{ DHS_REBOOT, "REBOOT" },
109+
{ DHS_ROUTERADVERT, "ROUTERADVERT" },
110+
{ DHS_BOUND, "DELEGATED" },
111+
{ DHS_UNKNOWN, NULL }
111112
};
112113

113114
static ssize_t
@@ -692,6 +693,7 @@ dhcpcd_reason_to_statetype(const char *reason,
692693
case DHS_PREINIT:
693694
case DHS_CARRIER:
694695
case DHS_NOCARRIER:
696+
case DHS_NOCARRIER_ROAMING:
695697
case DHS_DEPARTED:
696698
case DHS_STOPPED:
697699
*type = DHT_LINK;
@@ -1286,6 +1288,9 @@ dhcpcd_if_message(DHCPCD_IF *i, bool *new_msg)
12861288
} else
12871289
reason = _("Link is down");
12881290
break;
1291+
case DHS_NOCARRIER_ROAMING:
1292+
reason = _("Link is down, roaming");
1293+
break;
12891294
case DHS_DEPARTED:
12901295
reason = _("Departed");
12911296
break;

src/libdhcpcd/dhcpcd.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,8 @@ extern const char * const dhcpcd_cstates[];
120120
#define DHS_REBOOT 20
121121
#define DHS_ROUTERADVERT 21
122122
#define DHS_DELEGATED 22
123-
#define DHR_MAX 23
123+
#define DHS_NOCARRIER_ROAMING 23
124+
#define DHR_MAX 24
124125

125126
typedef struct dhcpcd_wi_avs {
126127
int value;

0 commit comments

Comments
 (0)