10 files changed, 37 insertions, 34 deletions

diff --git a/accel-pppd/ctrl/ipoe/arp.c b/accel-pppd/ctrl/ipoe/arp.c
index 1979c76..4f9669b 100644
--- a/accel-pppd/ctrl/ipoe/arp.c
+++ b/accel-pppd/ctrl/ipoe/arp.c
@@ -231,7 +231,7 @@ static int arp_read(struct triton_md_handler_t *h)
 void *arpd_start(struct ipoe_serv *ipoe)
 {
 	struct rb_node **p, *parent = NULL;
-	struct arp_node *n;
+	struct arp_node *n = NULL;
 	struct arp_tree *t;
 	int fd, ifindex = ipoe->ifindex, i;
 	char fname[1024];
diff --git a/accel-pppd/ctrl/ipoe/ipoe.h b/accel-pppd/ctrl/ipoe/ipoe.h
index 7c585a2..933a2c9 100644
--- a/accel-pppd/ctrl/ipoe/ipoe.h
+++ b/accel-pppd/ctrl/ipoe/ipoe.h
@@ -59,17 +59,17 @@ struct ipoe_serv {
 	char *opt_lua_username_func;
 #endif
 	int opt_weight;
-	int opt_shared:1;
-	int opt_dhcpv4:1;
-	int opt_up:1;
-	int opt_auto:1;
-	int opt_ifcfg:1;
-	int opt_nat:1;
-	int opt_ipv6:1;
-	int opt_ip_unnumbered:1;
-	int need_close:1;
-	int active:1;
-	int vlan_mon:1;
+	unsigned int opt_shared:1;
+	unsigned int opt_dhcpv4:1;
+	unsigned int opt_up:1;
+	unsigned int opt_auto:1;
+	unsigned int opt_ifcfg:1;
+	unsigned int opt_nat:1;
+	unsigned int opt_ipv6:1;
+	unsigned int opt_ip_unnumbered:1;
+	unsigned int need_close:1;
+	unsigned int active:1;
+	unsigned int vlan_mon:1;
 };
 
 struct ipoe_session {
@@ -110,15 +110,15 @@ struct ipoe_session {
 #ifdef RADIUS
 	struct rad_plugin_t radius;
 #endif
-	int started:1;
-	int terminating:1;
-	int dhcp_addr:1;
-	int relay_addr:1;
-	int l4_redirect:1;
-	int l4_redirect_set:1;
-	int terminate:1;
-	int UP:1;
-	int wait_start:1;
+	unsigned int started:1;
+	unsigned int terminating:1;
+	unsigned int dhcp_addr:1;
+	unsigned int relay_addr:1;
+	unsigned int l4_redirect:1;
+	unsigned int l4_redirect_set:1;
+	unsigned int terminate:1;
+	unsigned int UP:1;
+	unsigned int wait_start:1;
 };
 
 struct ipoe_session_info {
diff --git a/accel-pppd/ctrl/l2tp/dict.c b/accel-pppd/ctrl/l2tp/dict.c
index b636c87..4e4378d 100644
--- a/accel-pppd/ctrl/l2tp/dict.c
+++ b/accel-pppd/ctrl/l2tp/dict.c
@@ -266,8 +266,10 @@ static void dict_init(void)
 	if (!opt)
 		opt = DICTIONARY;
 
-	if (l2tp_dict_load(opt))
+	if (l2tp_dict_load(opt)) {
+		log_emerg("l2tp:dict_init:l2tp_dict_load: failed\n");
 		_exit(EXIT_FAILURE);
+	}
 }
 
 DEFINE_INIT(20, dict_init);
diff --git a/accel-pppd/ctrl/l2tp/l2tp.h b/accel-pppd/ctrl/l2tp/l2tp.h
index 12a2dbf..76de867 100644
--- a/accel-pppd/ctrl/l2tp/l2tp.h
+++ b/accel-pppd/ctrl/l2tp/l2tp.h
@@ -55,8 +55,8 @@ struct l2tp_attr_t
 {
 	struct list_head entry;
 	struct l2tp_dict_attr_t *attr;
-	int M:1;
-	int H:1;
+	unsigned int M:1;
+	unsigned int H:1;
 	int length;
 	l2tp_value_t val;
 };
diff --git a/accel-pppd/ctrl/pppoe/disc.c b/accel-pppd/ctrl/pppoe/disc.c
index b1119eb..8a82e1d 100644
--- a/accel-pppd/ctrl/pppoe/disc.c
+++ b/accel-pppd/ctrl/pppoe/disc.c
@@ -202,7 +202,7 @@ void pppoe_disc_stop(struct pppoe_serv_t *serv)
 		free_net(n);
 }
 
-static int forward(struct disc_net *net, int ifindex, void *pkt, int len)
+static int forward(struct disc_net *net, int ifindex, uint8_t *pkt, int len)
 {
 	struct pppoe_serv_t *n;
 	struct tree *t = &net->tree[ifindex & HASH_BITS];
diff --git a/accel-pppd/ctrl/pppoe/mac_filter.c b/accel-pppd/ctrl/pppoe/mac_filter.c
index d1e104e..ba78df6 100644
--- a/accel-pppd/ctrl/pppoe/mac_filter.c
+++ b/accel-pppd/ctrl/pppoe/mac_filter.c
@@ -52,7 +52,7 @@ static int mac_filter_load(const char *opt)
 	char *c;
 	char *name = _strdup(opt);
 	char *buf = _malloc(1024);
-	int n[ETH_ALEN];
+	unsigned int n[ETH_ALEN];
 	int i, line = 0;
 
 	c = strstr(name, ",");
@@ -122,7 +122,7 @@ err:
 
 static void mac_filter_add(const char *addr, void *client)
 {
-	int n[ETH_ALEN];
+	unsigned int n[ETH_ALEN];
 	struct mac_t *mac;
 	int i;
 
@@ -149,7 +149,7 @@ static void mac_filter_add(const char *addr, void *client)
 
 static void mac_filter_del(const char *addr, void *client)
 {
-	int n[ETH_ALEN];
+	unsigned int n[ETH_ALEN];
 	uint8_t a[ETH_ALEN];
 	struct mac_t *mac;
 	int i;
diff --git a/accel-pppd/ctrl/pppoe/pppoe.c b/accel-pppd/ctrl/pppoe/pppoe.c
index 6d87649..18aac8b 100644
--- a/accel-pppd/ctrl/pppoe/pppoe.c
+++ b/accel-pppd/ctrl/pppoe/pppoe.c
@@ -46,7 +46,7 @@ struct pppoe_conn_t {
 	struct pppoe_serv_t *serv;
 	uint16_t sid;
 	uint8_t addr[ETH_ALEN];
-	int ppp_started:1;
+	unsigned int ppp_started:1;
 
 	struct pppoe_tag *relay_sid;
 	struct pppoe_tag *host_uniq;
@@ -735,7 +735,8 @@ static int add_tag(uint8_t *pack, size_t pack_size, int type, const void *data,
 
 	tag->tag_type = htons(type);
 	tag->tag_len = htons(len);
-	memcpy(tag->tag_data, data, len);
+	if (data && len)
+		memcpy(tag->tag_data, data, len);
 
 	hdr->length = htons(ntohs(hdr->length) + sizeof(*tag) + len);
 	return 0;
diff --git a/accel-pppd/ctrl/pppoe/pppoe.h b/accel-pppd/ctrl/pppoe/pppoe.h
index 1ea7b07..7ba4ac6 100644
--- a/accel-pppd/ctrl/pppoe/pppoe.h
+++ b/accel-pppd/ctrl/pppoe/pppoe.h
@@ -97,8 +97,8 @@ struct pppoe_serv_t
 	int padi_limit;
 	time_t last_padi_limit_warn;
 
-	int stopping:1;
-	int vlan_mon:1;
+	unsigned int stopping:1;
+	unsigned int vlan_mon:1;
 };
 
 extern int conf_verbose;
diff --git a/accel-pppd/ctrl/pptp/pptp.c b/accel-pppd/ctrl/pptp/pptp.c
index 881fa9a..a5bcaca 100644
--- a/accel-pppd/ctrl/pptp/pptp.c
+++ b/accel-pppd/ctrl/pptp/pptp.c
@@ -147,7 +147,7 @@ again:
 	}
 
 	if ( n<size ) {
-		memcpy(conn->out_buf, buf + n, size - n);
+		memcpy(conn->out_buf, (uint8_t *)buf + n, size - n);
 		triton_md_enable_handler(&conn->hnd, MD_MODE_WRITE);
 	}
 
diff --git a/accel-pppd/ctrl/sstp/sstp.c b/accel-pppd/ctrl/sstp/sstp.c
index 8c4e55d..4b15400 100644
--- a/accel-pppd/ctrl/sstp/sstp.c
+++ b/accel-pppd/ctrl/sstp/sstp.c
@@ -128,7 +128,7 @@ struct sstp_conn_t {
 	int hello_sent;
 	int hello_interval;
 
-//	int bypass_auth:1;
+//	unsigned int bypass_auth:1;
 //	char *http_cookie;
 	uint8_t *nonce;
 	uint8_t *hlak_key;