Merge branch 'fdn-mods'

diff --git a/bgp.c b/bgp.c
index 4b8cb64..85415d1 100644 (file)
--- a/bgp.c
+++ b/bgp.c
@@ -29,7 +29,6 @@ char const *cvs_id_bgp = "$Id: bgp.c,v 1.12 2005/09/02 23:39:36 bodea Exp $";
 
 static void bgp_clear(struct bgp_peer *peer);
 static void bgp_set_retry(struct bgp_peer *peer);
-static void bgp_cidr(in_addr_t ip, int prefixlen, struct bgp_ip_prefix *pfx);
 static struct bgp_route_list *bgp_insert_route(struct bgp_route_list *head,
     struct bgp_route_list *new);
 static struct bgp_route6_list *bgp_insert_route6(struct bgp_route6_list *head,

diff --git a/cli.c b/cli.c
index 3a037fa..32c82a9 100644 (file)
--- a/cli.c
+++ b/cli.c
@@ -133,7 +133,7 @@ static int cmd_show_access_list(struct cli_def *cli, char *command, char **argv,
 /* match if b is a substr of a */
 #define MATCH(a,b) (!strncmp((a), (b), strlen(b)))
 
-void init_cli(char *hostname)
+void init_cli()
 {
        FILE *f;
        char buf[4096];
@@ -143,10 +143,6 @@ void init_cli(char *hostname)
        struct sockaddr_in addr;
 
        cli = cli_init();
-       if (hostname && *hostname)
-               cli_set_hostname(cli, hostname);
-       else
-               cli_set_hostname(cli, "l2tpns");
 
        c = cli_register_command(cli, NULL, "show", NULL, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, NULL);
        cli_register_command(cli, c, "banana", cmd_show_banana, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Show a banana");
@@ -301,6 +297,14 @@ void init_cli(char *hostname)
        }
 }
 
+void cli_init_hostname(char *hostname)
+{
+       if (hostname && *hostname)
+               cli_set_hostname(cli, hostname);
+       else
+               cli_set_hostname(cli, "l2tpns");
+}
+
 void cli_do(int sockfd)
 {
        int require_auth = 1;

diff --git a/cluster.c b/cluster.c
index 8ac56f4..f5e6de8 100644 (file)
--- a/cluster.c
+++ b/cluster.c
@@ -522,7 +522,7 @@ void cluster_check_slaves(void)
 //
 void cluster_check_master(void)
 {
-       int i, count, tcount, bcount, high_unique_id = 0;
+       int i, count, high_unique_id = 0;
        int last_free = 0;
        clockt t = TIME;
        static int probed = 0;
@@ -608,7 +608,7 @@ void cluster_check_master(void)
                // Count the highest used tunnel number as well.
                //
        config->cluster_highest_tunnelid = 0;
-       for (i = 0, tcount = 0; i < MAXTUNNEL; ++i) {
+       for (i = 0; i < MAXTUNNEL; ++i) {
                if (tunnel[i].state == TUNNELUNDEF)
                        tunnel[i].state = TUNNELFREE;
 
@@ -621,7 +621,7 @@ void cluster_check_master(void)
                 // Count the highest used bundle number as well.
                 //
         config->cluster_highest_bundleid = 0;
-        for (i = 0, bcount = 0; i < MAXBUNDLE; ++i) {
+        for (i = 0; i < MAXBUNDLE; ++i) {
                 if (bundle[i].state == BUNDLEUNDEF)
                         bundle[i].state = BUNDLEFREE;
 

diff --git a/l2tpns.c b/l2tpns.c
index 5fad2df..2d53ea2 100644 (file)
--- a/l2tpns.c
+++ b/l2tpns.c
@@ -469,7 +469,7 @@ static void routeset(sessionidt s, in_addr_t ip, int prefixlen, in_addr_t gw, in
                netlink_addattr(&req.nh, RTA_GATEWAY, &n_ip, sizeof(n_ip));
        }
 
-       LOG(1, s, 0, "Route %s %s/%d%s%s\n", add ? "add" : "del",
+       LOG(1, s, session[s].tunnel, "Route %s %s/%d%s%s\n", add ? "add" : "del",
            fmtaddr(htonl(ip), 0), prefixlen,
            gw ? " via" : "", gw ? fmtaddr(htonl(gw), 2) : "");
 
@@ -544,7 +544,7 @@ void route6set(sessionidt s, struct in6_addr ip, int prefixlen, int add)
        metric = 1;
        netlink_addattr(&req.nh, RTA_METRICS, &metric, sizeof(metric));
 
-       LOG(1, 0, 0, "Route %s %s/%d\n",
+       LOG(1, s, session[s].tunnel, "Route %s %s/%d\n",
            add ? "add" : "del",
            inet_ntop(AF_INET6, &ip, ipv6addr, INET6_ADDRSTRLEN),
            prefixlen);
@@ -1462,75 +1462,76 @@ static void processipout(uint8_t *buf, int len)
                return;
        }
 
-       // Add on L2TP header
-        {
-                bundleidt bid = 0;
-                if(session[s].bundle != 0 && bundle[session[s].bundle].num_of_links > 1)
-                {
-                        bid = session[s].bundle;
-                        s = bundle[bid].members[bundle[bid].current_ses = ++bundle[bid].current_ses % bundle[bid].num_of_links];
-                       t = session[s].tunnel;
-                       sp = &session[s];
-                        LOG(4, s, t, "MPPP: (1)Session number becomes: %d\n", s);
-                        if(len > MINFRAGLEN)
-                        {
-                                // Partition the packet to "bundle[b].num_of_links" fragments
-                               bundlet *b = &bundle[bid];
-                               uint32_t num_of_links = b->num_of_links;
-                                uint32_t fraglen = len / num_of_links;
-                               fraglen = (fraglen > session[s].mru ? session[s].mru : fraglen);
-                               uint32_t last_fraglen = fraglen + len % num_of_links;
-                               last_fraglen = (last_fraglen > session[s].mru ? len % num_of_links : last_fraglen);
-                               uint32_t remain = len;
-
-                               // send the first packet
-                                uint8_t *p = makeppp(fragbuf, sizeof(fragbuf), buf, fraglen, s, t, PPPIP, 0, bid, MP_BEGIN);
-                                if (!p) return;
-                                tunnelsend(fragbuf, fraglen + (p-fragbuf), t); // send it...
-                               // statistics
-                               update_session_out_stat(s, sp, fraglen);
-                               remain -= fraglen;
-                               while (remain > last_fraglen)
-                               { 
-                                       s = b->members[b->current_ses = ++b->current_ses % num_of_links];
-                                       t = session[s].tunnel;
-                                       sp = &session[s];
-                                       LOG(4, s, t, "MPPP: (2)Session number becomes: %d\n", s);
-                                       p = makeppp(fragbuf, sizeof(fragbuf), buf+(len - remain), fraglen, s, t, PPPIP, 0, bid, 0);
-                                       if (!p) return;
-                                       tunnelsend(fragbuf, fraglen + (p-fragbuf), t); // send it...
-                                       update_session_out_stat(s, sp, fraglen);
-                                       remain -= fraglen;
-                               }
-                               // send the last fragment
-                               s = b->members[b->current_ses = ++b->current_ses % num_of_links];
+       if(session[s].bundle != 0 && bundle[session[s].bundle].num_of_links > 1)
+       {
+               // Add on L2TP header
+               bundleidt bid = session[s].bundle;
+               bundlet *b = &bundle[bid];
+
+               b->current_ses = (b->current_ses + 1) % b->num_of_links;
+               s = b->members[b->current_ses];
+               t = session[s].tunnel;
+               sp = &session[s];
+               LOG(4, s, t, "MPPP: (1)Session number becomes: %d\n", s);
+               if(len > MINFRAGLEN)
+               {
+                       // Partition the packet to "bundle[b].num_of_links" fragments
+                       uint32_t num_of_links = b->num_of_links;
+                       uint32_t fraglen = len / num_of_links;
+                       fraglen = (fraglen > session[s].mru ? session[s].mru : fraglen);
+                       uint32_t last_fraglen = fraglen + len % num_of_links;
+                       last_fraglen = (last_fraglen > session[s].mru ? len % num_of_links : last_fraglen);
+                       uint32_t remain = len;
+
+                       // send the first packet
+                       uint8_t *p = makeppp(fragbuf, sizeof(fragbuf), buf, fraglen, s, t, PPPIP, 0, bid, MP_BEGIN);
+                       if (!p) return;
+                       tunnelsend(fragbuf, fraglen + (p-fragbuf), t); // send it...
+                       // statistics
+                       update_session_out_stat(s, sp, fraglen);
+                       remain -= fraglen;
+                       while (remain > last_fraglen)
+                       { 
+                               b->current_ses = (b->current_ses + 1) % num_of_links;
+                               s = b->members[b->current_ses];
                                t = session[s].tunnel;
                                sp = &session[s];
-                                       LOG(4, s, t, "MPPP: (2)Session number becomes: %d\n", s);
-                                       p = makeppp(fragbuf, sizeof(fragbuf), buf+(len - remain), remain, s, t, PPPIP, 0, bid, MP_END);
-                                       if (!p) return;
-                                       tunnelsend(fragbuf, remain + (p-fragbuf), t); // send it...
-                               update_session_out_stat(s, sp, remain);
-                               if (remain != last_fraglen)
-                                       LOG(3, s, t, "PROCESSIPOUT ERROR REMAIN != LAST_FRAGLEN, %d != %d\n", remain, last_fraglen);
-                        }
-                        else {
-                                // Send it as one frame
-                                uint8_t *p = makeppp(fragbuf, sizeof(fragbuf), buf, len, s, t, PPPIP, 0, bid, MP_BOTH_BITS);
-                                if (!p) return;
-                                tunnelsend(fragbuf, len + (p-fragbuf), t); // send it...
-                               LOG(4, s, t, "MPPP: packet sent as one frame\n");
-                               update_session_out_stat(s, sp, len);
-                        }
-                }
-                else
-                {
-                        uint8_t *p = makeppp(fragbuf, sizeof(fragbuf), buf, len, s, t, PPPIP, 0, 0, 0);
-                        if (!p) return;
-                        tunnelsend(fragbuf, len + (p-fragbuf), t); // send it...
+                               LOG(4, s, t, "MPPP: (2)Session number becomes: %d\n", s);
+                               p = makeppp(fragbuf, sizeof(fragbuf), buf+(len - remain), fraglen, s, t, PPPIP, 0, bid, 0);
+                               if (!p) return;
+                               tunnelsend(fragbuf, fraglen + (p-fragbuf), t); // send it...
+                               update_session_out_stat(s, sp, fraglen);
+                               remain -= fraglen;
+                       }
+                       // send the last fragment
+                       b->current_ses = (b->current_ses + 1) % num_of_links;
+                       s = b->members[b->current_ses];
+                       t = session[s].tunnel;
+                       sp = &session[s];
+                       LOG(4, s, t, "MPPP: (2)Session number becomes: %d\n", s);
+                       p = makeppp(fragbuf, sizeof(fragbuf), buf+(len - remain), remain, s, t, PPPIP, 0, bid, MP_END);
+                       if (!p) return;
+                       tunnelsend(fragbuf, remain + (p-fragbuf), t); // send it...
+                       update_session_out_stat(s, sp, remain);
+                       if (remain != last_fraglen)
+                               LOG(3, s, t, "PROCESSIPOUT ERROR REMAIN != LAST_FRAGLEN, %d != %d\n", remain, last_fraglen);
+               }
+               else {
+                       // Send it as one frame
+                       uint8_t *p = makeppp(fragbuf, sizeof(fragbuf), buf, len, s, t, PPPIP, 0, bid, MP_BOTH_BITS);
+                       if (!p) return;
+                       tunnelsend(fragbuf, len + (p-fragbuf), t); // send it...
+                       LOG(4, s, t, "MPPP: packet sent as one frame\n");
                        update_session_out_stat(s, sp, len);
-                }
-        }
+               }
+       }
+       else
+       {
+               uint8_t *p = makeppp(fragbuf, sizeof(fragbuf), buf, len, s, t, PPPIP, 0, 0, 0);
+               if (!p) return;
+               tunnelsend(fragbuf, len + (p-fragbuf), t); // send it...
+               update_session_out_stat(s, sp, len);
+       }
 
        // Snooping this session, send it to intercept box
        if (sp->snoop_ip && sp->snoop_port)
@@ -1610,7 +1611,10 @@ static void processipv6out(uint8_t * buf, int len)
        if (session[s].bundle && bundle[session[s].bundle].num_of_links > 1)
        {
                bundleidt bid = session[s].bundle;
-               s = bundle[bid].members[bundle[bid].current_ses = ++bundle[bid].current_ses % bundle[bid].num_of_links];
+               bundlet *b = &bundle[bid];
+
+               b->current_ses = (b->current_ses + 1) % b->num_of_links;
+               s = b->members[b->current_ses];
                LOG(3, s, session[s].tunnel, "MPPP: Session number becomes: %u\n", s);
        }
        t = session[s].tunnel;
@@ -1665,7 +1669,6 @@ static void send_ipout(sessionidt s, uint8_t *buf, int len)
 {
        sessiont *sp;
        tunnelidt t;
-       in_addr_t ip;
 
        uint8_t b[MAXETHER + 20];
 
@@ -1679,8 +1682,6 @@ static void send_ipout(sessionidt s, uint8_t *buf, int len)
        buf += 4;
        len -= 4;
 
-       ip = *(in_addr_t *)(buf + 16);
-
        if (!session[s].ip)
                return;
 
@@ -1713,10 +1714,10 @@ static void send_ipout(sessionidt s, uint8_t *buf, int len)
 static void control16(controlt * c, uint16_t avp, uint16_t val, uint8_t m)
 {
        uint16_t l = (m ? 0x8008 : 0x0008);
-       *(uint16_t *) (c->buf + c->length + 0) = htons(l);
-       *(uint16_t *) (c->buf + c->length + 2) = htons(0);
-       *(uint16_t *) (c->buf + c->length + 4) = htons(avp);
-       *(uint16_t *) (c->buf + c->length + 6) = htons(val);
+       c->buf16[c->length/2 + 0] = htons(l);
+       c->buf16[c->length/2 + 1] = htons(0);
+       c->buf16[c->length/2 + 2] = htons(avp);
+       c->buf16[c->length/2 + 3] = htons(val);
        c->length += 8;
 }
 
@@ -1724,10 +1725,10 @@ static void control16(controlt * c, uint16_t avp, uint16_t val, uint8_t m)
 static void control32(controlt * c, uint16_t avp, uint32_t val, uint8_t m)
 {
        uint16_t l = (m ? 0x800A : 0x000A);
-       *(uint16_t *) (c->buf + c->length + 0) = htons(l);
-       *(uint16_t *) (c->buf + c->length + 2) = htons(0);
-       *(uint16_t *) (c->buf + c->length + 4) = htons(avp);
-       *(uint32_t *) (c->buf + c->length + 6) = htonl(val);
+       c->buf16[c->length/2 + 0] = htons(l);
+       c->buf16[c->length/2 + 1] = htons(0);
+       c->buf16[c->length/2 + 2] = htons(avp);
+       *(uint32_t *) &c->buf[c->length + 6] = htonl(val);
        c->length += 10;
 }
 
@@ -1735,10 +1736,10 @@ static void control32(controlt * c, uint16_t avp, uint32_t val, uint8_t m)
 static void controls(controlt * c, uint16_t avp, char *val, uint8_t m)
 {
        uint16_t l = ((m ? 0x8000 : 0) + strlen(val) + 6);
-       *(uint16_t *) (c->buf + c->length + 0) = htons(l);
-       *(uint16_t *) (c->buf + c->length + 2) = htons(0);
-       *(uint16_t *) (c->buf + c->length + 4) = htons(avp);
-       memcpy(c->buf + c->length + 6, val, strlen(val));
+       c->buf16[c->length/2 + 0] = htons(l);
+       c->buf16[c->length/2 + 1] = htons(0);
+       c->buf16[c->length/2 + 2] = htons(avp);
+       memcpy(&c->buf[c->length + 6], val, strlen(val));
        c->length += 6 + strlen(val);
 }
 
@@ -1746,10 +1747,10 @@ static void controls(controlt * c, uint16_t avp, char *val, uint8_t m)
 static void controlb(controlt * c, uint16_t avp, uint8_t *val, unsigned int len, uint8_t m)
 {
        uint16_t l = ((m ? 0x8000 : 0) + len + 6);
-       *(uint16_t *) (c->buf + c->length + 0) = htons(l);
-       *(uint16_t *) (c->buf + c->length + 2) = htons(0);
-       *(uint16_t *) (c->buf + c->length + 4) = htons(avp);
-       memcpy(c->buf + c->length + 6, val, len);
+       c->buf16[c->length/2 + 0] = htons(l);
+       c->buf16[c->length/2 + 1] = htons(0);
+       c->buf16[c->length/2 + 2] = htons(avp);
+       memcpy(&c->buf[c->length + 6], val, len);
        c->length += 6 + len;
 }
 
@@ -1766,7 +1767,7 @@ static controlt *controlnew(uint16_t mtype)
        }
        assert(c);
        c->next = 0;
-       *(uint16_t *) (c->buf + 0) = htons(0xC802); // flags/ver
+       c->buf16[0] = htons(0xC802); // flags/ver
        c->length = 12;
        control16(c, 0, mtype, 1);
        return c;
@@ -1776,26 +1777,26 @@ static controlt *controlnew(uint16_t mtype)
 // (ZLB send).
 static void controlnull(tunnelidt t)
 {
-       uint8_t buf[12];
+       uint16_t buf[6];
        if (tunnel[t].controlc) // Messages queued; They will carry the ack.
                return;
 
-       *(uint16_t *) (buf + 0) = htons(0xC802); // flags/ver
-       *(uint16_t *) (buf + 2) = htons(12); // length
-       *(uint16_t *) (buf + 4) = htons(tunnel[t].far); // tunnel
-       *(uint16_t *) (buf + 6) = htons(0); // session
-       *(uint16_t *) (buf + 8) = htons(tunnel[t].ns); // sequence
-       *(uint16_t *) (buf + 10) = htons(tunnel[t].nr); // sequence
-       tunnelsend(buf, 12, t);
+       buf[0] = htons(0xC802); // flags/ver
+       buf[1] = htons(12); // length
+       buf[2] = htons(tunnel[t].far); // tunnel
+       buf[3] = htons(0); // session
+       buf[4] = htons(tunnel[t].ns); // sequence
+       buf[5] = htons(tunnel[t].nr); // sequence
+       tunnelsend((uint8_t *)buf, 12, t);
 }
 
 // add a control message to a tunnel, and send if within window
 static void controladd(controlt *c, sessionidt far, tunnelidt t)
 {
-       *(uint16_t *) (c->buf + 2) = htons(c->length); // length
-       *(uint16_t *) (c->buf + 4) = htons(tunnel[t].far); // tunnel
-       *(uint16_t *) (c->buf + 6) = htons(far); // session
-       *(uint16_t *) (c->buf + 8) = htons(tunnel[t].ns); // sequence
+       c->buf16[1] = htons(c->length); // length
+       c->buf16[2] = htons(tunnel[t].far); // tunnel
+       c->buf16[3] = htons(far); // session
+       c->buf16[4] = htons(tunnel[t].ns); // sequence
        tunnel[t].ns++;              // advance sequence
        // link in message in to queue
        if (tunnel[t].controlc)
@@ -1975,11 +1976,11 @@ void sessionshutdown(sessionidt s, char const *reason, int cdn_result, int cdn_e
                {
                        // This session was part of a bundle
                        bundle[b].num_of_links--;
-                       LOG(3, s, 0, "MPPP: Dropping member link: %d from bundle %d\n",s,b);
+                       LOG(3, s, session[s].tunnel, "MPPP: Dropping member link: %d from bundle %d\n",s,b);
                        if(bundle[b].num_of_links == 0) 
                        {
                                bundleclear(b);
-                               LOG(3, s, 0, "MPPP: Kill bundle: %d (No remaing member links)\n",b);
+                               LOG(3, s, session[s].tunnel, "MPPP: Kill bundle: %d (No remaing member links)\n",b);
                        }
                        else 
                        {
@@ -1996,7 +1997,7 @@ void sessionshutdown(sessionidt s, char const *reason, int cdn_result, int cdn_e
                                                        break;
                                                }
                                        bundle[b].members[mem_num] = bundle[b].members[bundle[b].num_of_links];
-                                       LOG(3, s, 0, "MPPP: Adjusted member links array\n");
+                                       LOG(3, s, session[s].tunnel, "MPPP: Adjusted member links array\n");
                                }
                        }
                        cluster_send_bundle(b);
@@ -2011,10 +2012,10 @@ void sessionshutdown(sessionidt s, char const *reason, int cdn_result, int cdn_e
                controlt *c = controlnew(14); // sending CDN
                if (cdn_error)
                {
-                       uint8_t buf[4];
-                       *(uint16_t *) buf     = htons(cdn_result);
-                       *(uint16_t *) (buf+2) = htons(cdn_error);
-                       controlb(c, 1, buf, 4, 1);
+                       uint16_t buf[2];
+                       buf[0] = htons(cdn_result);
+                       buf[1] = htons(cdn_error);
+                       controlb(c, 1, (uint8_t *)buf, 4, 1);
                }
                else
                        control16(c, 1, cdn_result, 1);
@@ -2203,21 +2204,21 @@ static void tunnelshutdown(tunnelidt t, char *reason, int result, int error, cha
                controlt *c = controlnew(4);    // sending StopCCN
                if (error)
                {
-                       uint8_t buf[64];
+                       uint16_t buf[32];
                        int l = 4;
-                       *(uint16_t *) buf     = htons(result);
-                       *(uint16_t *) (buf+2) = htons(error);
+                       buf[0] = htons(result);
+                       buf[1] = htons(error);
                        if (msg)
                        {
                                int m = strlen(msg);
                                if (m + 4 > sizeof(buf))
                                    m = sizeof(buf) - 4;
 
-                               memcpy(buf+4, msg, m);
+                               memcpy(buf+2, msg, m);
                                l += m;
                        }
 
-                       controlb(c, 1, buf, l, 1);
+                       controlb(c, 1, (uint8_t *)buf, l, 1);
                }
                else
                        control16(c, 1, result, 1);
@@ -4294,14 +4295,9 @@ static void initdata(int optdebug, char *optconfig)
 
        if (!*hostname)
        {
-               if (!*config->hostname)
-               {
-                       // Grab my hostname unless it's been specified
-                       gethostname(hostname, sizeof(hostname));
-                       stripdomain(hostname);
-               }
-               else
-                       strcpy(hostname, config->hostname);
+               // Grab my hostname unless it's been specified
+               gethostname(hostname, sizeof(hostname));
+               stripdomain(hostname);
        }
 
        _statistics->start_time = _statistics->last_reset = time(NULL);
@@ -4716,8 +4712,12 @@ int main(int argc, char *argv[])
        initplugins();
        initdata(optdebug, optconfig);
 
-       init_cli(hostname);
+       init_cli();
        read_config_file();
+       /* set hostname /after/ having read the config file */
+       if (*config->hostname)
+               strcpy(hostname, config->hostname);
+       cli_init_hostname(hostname);
        update_config();
        init_tbf(config->num_tbfs);
 

diff --git a/l2tpns.h b/l2tpns.h
index 5cba32c..f38e9f3 100644 (file)
--- a/l2tpns.h
+++ b/l2tpns.h
@@ -242,7 +242,10 @@ typedef struct controls            // control message
 {
        struct controls *next;  // next in queue
        uint16_t length;        // length
-       uint8_t buf[MAXCONTROL];
+       union {
+               uint8_t buf[MAXCONTROL];
+               uint16_t buf16[MAXCONTROL/2];
+       } __attribute__ ((__transparent_union__));
 }
 controlt;
 
@@ -907,7 +910,8 @@ void become_master(void);   // We're the master; kick off any required master init
 
 
 // cli.c
-void init_cli(char *hostname);
+void init_cli();
+void cli_init_hostname(char *hostname);
 void cli_do_file(FILE *fh);
 void cli_do(int sockfd);
 int cli_arg_help(struct cli_def *cli, int cr_ok, char *entry, ...);

diff --git a/ppp.c b/ppp.c
index 7be79ce..5dccf0d 100644 (file)
--- a/ppp.c
+++ b/ppp.c
@@ -1540,7 +1540,7 @@ void processipv6cp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                uint8_t *o = p + 4;
                int length = l - 4;
                int gotip = 0;
-               uint8_t ident[8];
+               uint32_t ident[2];
 
                while (length > 2)
                {
@@ -1552,12 +1552,12 @@ void processipv6cp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                                gotip++; // seen address
                                if (o[1] != 10) return;
 
-                               *(uint32_t *) ident = htonl(session[s].ip);
-                               *(uint32_t *) (ident + 4) = 0;
+                               ident[0] = htonl(session[s].ip);
+                               ident[1] = 0;
 
                                if (memcmp(o + 2, ident, sizeof(ident)))
                                {
-                                       q = ppp_conf_nak(s, b, sizeof(b), PPPIPV6CP, &response, q, p, o, ident, sizeof(ident));
+                                       q = ppp_conf_nak(s, b, sizeof(b), PPPIPV6CP, &response, q, p, o, (uint8_t *)ident, sizeof(ident));
                                        if (!q) return;
                                }
 
@@ -2375,7 +2375,7 @@ uint8_t *makeppp(uint8_t *b, int size, uint8_t *p, int l, sessionidt s, tunnelid
 
        if ((b - start) + l > size)
        {
-               LOG(2, s, t, "makeppp would overflow buffer (size=%d, header+payload=%d)\n", size, (b - start) + l);
+               LOG(2, s, t, "makeppp would overflow buffer (size=%d, header+payload=%td)\n", size, (b - start) + l);
                return NULL;
        }