pppd: Add support for registering ppp interface via Linux rtnetlink API

[ppp.git] / pppd / plugins / pppol2tp / pppol2tp.c

diff --git a/pppd/plugins/pppol2tp/pppol2tp.c b/pppd/plugins/pppol2tp/pppol2tp.c
index 0e28606f9ae4caae126f32bcabd49d9ae79ce78e..c9902afed2f8e24f79cb3c688ad495b01d989876 100644 (file)
--- a/pppd/plugins/pppol2tp/pppol2tp.c
+++ b/pppd/plugins/pppol2tp/pppol2tp.c
@@ -20,6 +20,10 @@
  *  as published by the Free Software Foundation; either version
  *  2 of the License, or (at your option) any later version.
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
@@ -121,10 +125,10 @@ static int setdevname_pppol2tp(char **argv)
                char buffer[128];
                struct sockaddr pppol2tp;
        } s;
-       int len = sizeof(s);
+       socklen_t len = sizeof(s);
        char **a;
        int tmp;
-       int tmp_len = sizeof(tmp);
+       socklen_t tmp_len = sizeof(tmp);
 
        if (device_got_set)
                return 0;
@@ -148,6 +152,10 @@ static int setdevname_pppol2tp(char **argv)
                fatal("PPPoL2TP kernel driver not installed");
        }
 
+       pppol2tp_fd_str = strdup(*argv);
+       if (pppol2tp_fd_str == NULL)
+               novm("PPPoL2TP FD");
+
        /* Setup option defaults. Compression options are disabled! */
 
        modem = 0;
@@ -199,8 +207,8 @@ static void send_config_pppol2tp(int mtu,
        int on = 1;
        int fd;
        char reorderto[16];
-       char tid[8];
-       char sid[8];
+       char tid[12];
+       char sid[12];
 
        if (pppol2tp_ifname[0]) {
                struct ifreq ifr;
@@ -233,10 +241,10 @@ static void send_config_pppol2tp(int mtu,
                sprintf(&reorderto[0], "%d ", pppol2tp_reorder_timeout);
        tid[0] = '\0';
        if (pppol2tp_tunnel_id > 0)
-               sprintf(&tid[0], "%hu ", pppol2tp_tunnel_id);
+               sprintf(&tid[0], "%u ", pppol2tp_tunnel_id);
        sid[0] = '\0';
        if (pppol2tp_session_id > 0)
-               sprintf(&sid[0], "%hu ", pppol2tp_session_id);
+               sprintf(&sid[0], "%u ", pppol2tp_session_id);
 
        dbglog("PPPoL2TP options: %s%s%s%s%s%s%s%s%sdebugmask %d",
               pppol2tp_recv_seq ? "recvseq " : "",
@@ -501,20 +509,22 @@ void plugin_init(void)
         */
        add_notifier(&ip_up_notifier, pppol2tp_ip_up, NULL);
        add_notifier(&ip_down_notifier, pppol2tp_ip_down, NULL);
+#ifdef INET6
        add_notifier(&ipv6_up_notifier, pppol2tp_ip_up, NULL);
        add_notifier(&ipv6_down_notifier, pppol2tp_ip_down, NULL);
+#endif
 }
 
 struct channel pppol2tp_channel = {
-    options: pppol2tp_options,
-    process_extra_options: NULL,
-    check_options: &pppol2tp_check_options,
-    connect: &connect_pppol2tp,
-    disconnect: &disconnect_pppol2tp,
-    establish_ppp: &generic_establish_ppp,
-    disestablish_ppp: &generic_disestablish_ppp,
-    send_config: &send_config_pppol2tp,
-    recv_config: &recv_config_pppol2tp,
-    close: NULL,
-    cleanup: NULL
+    .options = pppol2tp_options,
+    .process_extra_options = NULL,
+    .check_options = &pppol2tp_check_options,
+    .connect = &connect_pppol2tp,
+    .disconnect = &disconnect_pppol2tp,
+    .establish_ppp = &generic_establish_ppp,
+    .disestablish_ppp = &generic_disestablish_ppp,
+    .send_config = &send_config_pppol2tp,
+    .recv_config = &recv_config_pppol2tp,
+    .close = NULL,
+    .cleanup = NULL
 };