summaryrefslogtreecommitdiff
path: root/accel-pppd/ppp
diff options
context:
space:
mode:
Diffstat (limited to 'accel-pppd/ppp')
-rw-r--r--accel-pppd/ppp/ccp_mppe.c12
-rw-r--r--accel-pppd/ppp/ipcp_opt_ipaddr.c2
-rw-r--r--accel-pppd/ppp/ipv6cp_opt_intfid.c9
-rw-r--r--accel-pppd/ppp/lcp_opt_mru.c4
-rw-r--r--accel-pppd/ppp/ppp.h10
-rw-r--r--accel-pppd/ppp/ppp_auth.c2
-rw-r--r--accel-pppd/ppp/ppp_ccp.h4
-rw-r--r--accel-pppd/ppp/ppp_ipcp.h8
-rw-r--r--accel-pppd/ppp/ppp_ipv6cp.h8
-rw-r--r--accel-pppd/ppp/ppp_lcp.h4
10 files changed, 32 insertions, 31 deletions
diff --git a/accel-pppd/ppp/ccp_mppe.c b/accel-pppd/ppp/ccp_mppe.c
index 456fe821..cb41c0da 100644
--- a/accel-pppd/ppp/ccp_mppe.c
+++ b/accel-pppd/ppp/ccp_mppe.c
@@ -278,12 +278,12 @@ static void mppe_print(void (*print)(const char *fmt,...),struct ccp_option_t *o
bits = 0;
print("<mppe %sH %sM %sS %sL %sD %sC>",
- bits & MPPE_H ? "+" : "-",
- bits & MPPE_M ? "+" : "-",
- bits & MPPE_S ? "+" : "-",
- bits & MPPE_L ? "+" : "-",
- bits & MPPE_D ? "+" : "-",
- bits & MPPE_C ? "+" : "-"
+ (bits & MPPE_H) ? "+" : "-",
+ (bits & MPPE_M) ? "+" : "-",
+ (bits & MPPE_S) ? "+" : "-",
+ (bits & MPPE_L) ? "+" : "-",
+ (bits & MPPE_D) ? "+" : "-",
+ (bits & MPPE_C) ? "+" : "-"
);
}
diff --git a/accel-pppd/ppp/ipcp_opt_ipaddr.c b/accel-pppd/ppp/ipcp_opt_ipaddr.c
index 6354bf1b..c10ddd25 100644
--- a/accel-pppd/ppp/ipcp_opt_ipaddr.c
+++ b/accel-pppd/ppp/ipcp_opt_ipaddr.c
@@ -31,7 +31,7 @@ struct ipaddr_option_t
{
struct ipcp_option_t opt;
struct ppp_t *ppp;
- int started:1;
+ unsigned int started:1;
};
static struct ipcp_option_handler_t ipaddr_opt_hnd = {
diff --git a/accel-pppd/ppp/ipv6cp_opt_intfid.c b/accel-pppd/ppp/ipv6cp_opt_intfid.c
index bc7fae89..fff74160 100644
--- a/accel-pppd/ppp/ipv6cp_opt_intfid.c
+++ b/accel-pppd/ppp/ipv6cp_opt_intfid.c
@@ -42,7 +42,7 @@ static void put_ipv6_item(struct ap_session *ses, struct ipv6db_item_t *ip6);
struct ipaddr_option_t
{
struct ipv6cp_option_t opt;
- int started:1;
+ unsigned int started:1;
struct ppp_t *ppp;
};
@@ -163,7 +163,8 @@ static uint64_t generate_intf_id(struct ppp_t *ppp)
static uint64_t generate_peer_intf_id(struct ppp_t *ppp)
{
char str[4];
- int i, n;
+ int i;
+ unsigned int n;
union {
uint64_t intf_id;
uint16_t addr16[4];
@@ -292,14 +293,14 @@ static uint64_t parse_intfid(const char *opt)
uint16_t u16[4];
} u;
- int n[4];
+ unsigned int n[4];
int i;
if (sscanf(opt, "%x:%x:%x:%x", &n[0], &n[1], &n[2], &n[3]) != 4)
goto err;
for (i = 0; i < 4; i++) {
- if (n[i] < 0 || n[i] > 0xffff)
+ if (n[i] > 0xffff)
goto err;
u.u16[i] = htons(n[i]);
}
diff --git a/accel-pppd/ppp/lcp_opt_mru.c b/accel-pppd/ppp/lcp_opt_mru.c
index ac4ce7fb..74b107e9 100644
--- a/accel-pppd/ppp/lcp_opt_mru.c
+++ b/accel-pppd/ppp/lcp_opt_mru.c
@@ -35,8 +35,8 @@ struct mru_option_t
struct lcp_option_t opt;
int mru;
int mtu;
- int naked:1;
- int rejected:1;
+ unsigned int naked:1;
+ unsigned int rejected:1;
};
static struct lcp_option_handler_t mru_opt_hnd=
diff --git a/accel-pppd/ppp/ppp.h b/accel-pppd/ppp/ppp.h
index f0fbcd34..2efa061c 100644
--- a/accel-pppd/ppp/ppp.h
+++ b/accel-pppd/ppp/ppp.h
@@ -70,11 +70,11 @@ struct ppp_layer_data_t
struct list_head entry;
struct ppp_layer_t *layer;
struct layer_node_t *node;
- int passive:1;
- int optional:1;
- int starting:1;
- int started:1;
- int finished:1;
+ unsigned int passive:1;
+ unsigned int optional:1;
+ unsigned int starting:1;
+ unsigned int started:1;
+ unsigned int finished:1;
};
struct ppp_layer_t
diff --git a/accel-pppd/ppp/ppp_auth.c b/accel-pppd/ppp/ppp_auth.c
index ab5200ab..f30c6b9c 100644
--- a/accel-pppd/ppp/ppp_auth.c
+++ b/accel-pppd/ppp/ppp_auth.c
@@ -38,7 +38,7 @@ struct auth_option_t
struct lcp_option_t opt;
struct list_head auth_list;
struct auth_data_t *auth;
- int started:1;
+ unsigned int started:1;
};
struct auth_layer_data_t
diff --git a/accel-pppd/ppp/ppp_ccp.h b/accel-pppd/ppp/ppp_ccp.h
index cb5b1644..243a4b5c 100644
--- a/accel-pppd/ppp/ppp_ccp.h
+++ b/accel-pppd/ppp/ppp_ccp.h
@@ -84,8 +84,8 @@ struct ppp_ccp_t
int ropt_len;
int conf_req_len;
- int starting:1;
- int started:1;
+ unsigned int starting:1;
+ unsigned int started:1;
};
int ccp_option_register(struct ccp_option_handler_t *h);
diff --git a/accel-pppd/ppp/ppp_ipcp.h b/accel-pppd/ppp/ppp_ipcp.h
index a46d9b6d..036f0a4d 100644
--- a/accel-pppd/ppp/ppp_ipcp.h
+++ b/accel-pppd/ppp/ppp_ipcp.h
@@ -60,7 +60,7 @@ struct ipcp_option_t
int id;
int len;
int state;
- int print:1;
+ unsigned int print:1;
struct ipcp_option_handler_t *h;
};
@@ -93,9 +93,9 @@ struct ppp_ipcp_t
int ropt_len;
int conf_req_len;
- int starting:1;
- int started:1;
- int delay_ack:1;
+ unsigned int starting:1;
+ unsigned int started:1;
+ unsigned int delay_ack:1;
};
int ipcp_option_register(struct ipcp_option_handler_t *h);
diff --git a/accel-pppd/ppp/ppp_ipv6cp.h b/accel-pppd/ppp/ppp_ipv6cp.h
index 57bb73b4..6f1789ec 100644
--- a/accel-pppd/ppp/ppp_ipv6cp.h
+++ b/accel-pppd/ppp/ppp_ipv6cp.h
@@ -66,7 +66,7 @@ struct ipv6cp_option_t
int id;
int len;
int state;
- int print:1;
+ unsigned int print:1;
struct ipv6cp_option_handler_t *h;
};
@@ -99,9 +99,9 @@ struct ppp_ipv6cp_t
int ropt_len;
int conf_req_len;
- int starting:1;
- int started:1;
- int delay_ack:1;
+ unsigned int starting:1;
+ unsigned int started:1;
+ unsigned int delay_ack:1;
};
int ipv6cp_option_register(struct ipv6cp_option_handler_t *h);
diff --git a/accel-pppd/ppp/ppp_lcp.h b/accel-pppd/ppp/ppp_lcp.h
index 10c55b06..39693d43 100644
--- a/accel-pppd/ppp/ppp_lcp.h
+++ b/accel-pppd/ppp/ppp_lcp.h
@@ -92,7 +92,7 @@ struct lcp_option_t
int id;
int len;
int state;
- int print:1;
+ unsigned int print:1;
struct lcp_option_handler_t *h;
};
@@ -129,7 +129,7 @@ struct ppp_lcp_t
int ropt_len;
int conf_req_len;
- int started:1;
+ unsigned int started:1;
};
int lcp_option_register(struct lcp_option_handler_t *h);
generated by cgit v1.2.3 (git 2.39.1) at 2026-05-05 05:06:34 +0000