diff options
| author | Dmitry Kozlov <xeb@mail.ru> | 2021-03-17 11:32:08 +0300 |
|---|---|---|
| committer | Dmitry Kozlov <xeb@mail.ru> | 2021-03-17 11:32:08 +0300 |
| commit | bb4f308fc3b0086bb51cc021bf2e8fc4ffb4a7e4 (patch) | |
| tree | b036b6147e2540b59be8bc108c8cd71e89e73ecc /accel-pppd/ctrl | |
| parent | b1ad6a35a605e9491b8492b5af525994d189d09e (diff) | |
| parent | 02ee3cf8abebec16bf9106426e095495144c3d2f (diff) | |
| download | accel-ppp-bb4f308fc3b0086bb51cc021bf2e8fc4ffb4a7e4.tar.gz accel-ppp-bb4f308fc3b0086bb51cc021bf2e8fc4ffb4a7e4.zip | |
Merge branch 'master' of github.com:xebd/accel-ppp
Diffstat (limited to 'accel-pppd/ctrl')
| -rw-r--r-- | accel-pppd/ctrl/ipoe/ipoe.c | 2 | ||||
| -rw-r--r-- | accel-pppd/ctrl/l2tp/l2tp.c | 4 | ||||
| -rw-r--r-- | accel-pppd/ctrl/pppoe/disc.c | 2 | ||||
| -rw-r--r-- | accel-pppd/ctrl/pppoe/pppoe.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/accel-pppd/ctrl/ipoe/ipoe.c b/accel-pppd/ctrl/ipoe/ipoe.c index d91596ae..0649e9c8 100644 --- a/accel-pppd/ctrl/ipoe/ipoe.c +++ b/accel-pppd/ctrl/ipoe/ipoe.c @@ -4051,7 +4051,7 @@ static void load_config(void) opt = conf_get_opt("ipoe", "check-ip"); if (!opt) opt = conf_get_opt("common", "check-ip"); - if (opt && opt >= 0) + if (opt) conf_check_exists = atoi(opt) > 0; #ifdef RADIUS diff --git a/accel-pppd/ctrl/l2tp/l2tp.c b/accel-pppd/ctrl/l2tp/l2tp.c index 2467189f..8567027d 100644 --- a/accel-pppd/ctrl/l2tp/l2tp.c +++ b/accel-pppd/ctrl/l2tp/l2tp.c @@ -4224,7 +4224,7 @@ static int l2tp_tunnel_store_msg(struct l2tp_conn_t *conn, static int l2tp_tunnel_reply(struct l2tp_conn_t *conn, int need_ack) { - const struct l2tp_attr_t *msg_attr; + const struct l2tp_attr_t *msg_attr = NULL; struct l2tp_packet_t *pack; struct l2tp_sess_t *sess; uint16_t msg_sid; @@ -4430,7 +4430,7 @@ static int l2tp_udp_read(struct triton_md_handler_t *h) { struct l2tp_serv_t *serv = container_of(h, typeof(*serv), hnd); struct l2tp_packet_t *pack; - const struct l2tp_attr_t *msg_type; + const struct l2tp_attr_t *msg_type = NULL; struct in_pktinfo pkt_info; char src_addr[17]; diff --git a/accel-pppd/ctrl/pppoe/disc.c b/accel-pppd/ctrl/pppoe/disc.c index a0a21751..b1119eb1 100644 --- a/accel-pppd/ctrl/pppoe/disc.c +++ b/accel-pppd/ctrl/pppoe/disc.c @@ -139,7 +139,7 @@ int pppoe_disc_start(struct pppoe_serv_t *serv) struct rb_node **p, *parent = NULL; struct tree *t; int ifindex = serv->ifindex, i; - struct pppoe_serv_t *n; + struct pppoe_serv_t *n = NULL; if (!net) { pthread_mutex_lock(&nets_lock); diff --git a/accel-pppd/ctrl/pppoe/pppoe.c b/accel-pppd/ctrl/pppoe/pppoe.c index 045a638e..6d876495 100644 --- a/accel-pppd/ctrl/pppoe/pppoe.c +++ b/accel-pppd/ctrl/pppoe/pppoe.c @@ -1577,7 +1577,7 @@ void _server_stop(struct pppoe_serv_t *serv) void pppoe_server_free(struct pppoe_serv_t *serv) { - struct delayed_pado_t *pado; + struct delayed_pado_t *pado = NULL; pthread_rwlock_wrlock(&serv_lock); list_del(&serv->entry); |