Merge branch 'pppoe-discovery' of https://github.com/pali/ppp

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

diff --git a/pppd/plugins/pppoatm/pppoatm.c b/pppd/plugins/pppoatm/pppoatm.c
index cef5ff75dfd5471cce92a274982994e69e2c256a..09cd0b8bfb0142524d12c15971f8e13844e7e6b0 100644 (file)
--- a/pppd/plugins/pppoatm/pppoatm.c
+++ b/pppd/plugins/pppoatm/pppoatm.c
@@ -13,6 +13,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>
@@ -70,18 +74,20 @@ static int setdevname_pppoatm(const char *cp, const char **argv, int doit)
 {
        struct sockaddr_atmpvc addr;
        extern struct stat devstat;
+
        if (device_got_set)
                return 0;
-       //info("PPPoATM setdevname_pppoatm: '%s'", cp);
+
        memset(&addr, 0, sizeof addr);
        if (text2atm(cp, (struct sockaddr *) &addr, sizeof(addr),
            T2A_PVC | T2A_NAME | T2A_WILDCARD) < 0) {
-               if(doit)
-                   info("atm does not recognize: %s", cp);
+               if (doit)
+                       info("cannot parse the ATM address: %s", cp);
                return 0;
-           }
-       if (!doit) return 1;
-       //if (!dev_set_ok()) return -1;
+       }
+       if (!doit)
+               return 1;
+
        memcpy(&pvcaddr, &addr, sizeof pvcaddr);
        strlcpy(devnam, cp, sizeof devnam);
        devstat.st_mode = S_IFSOCK;
@@ -93,7 +99,6 @@ static int setdevname_pppoatm(const char *cp, const char **argv, int doit)
                lcp_allowoptions[0].neg_asyncmap = 0;
                lcp_wantoptions[0].neg_pcompression = 0;
        }
-       info("PPPoATM setdevname_pppoatm - SUCCESS:%s", cp);
        device_got_set = 1;
        return 1;
 }
@@ -108,6 +113,7 @@ static void no_device_given_pppoatm(void)
 static void set_line_discipline_pppoatm(int fd)
 {
        struct atm_backend_ppp be;
+
        be.backend_num = ATM_BACKEND_PPP;
        if (!llc_encaps)
                be.encaps = PPPOATM_ENCAPS_VC;
@@ -115,6 +121,7 @@ static void set_line_discipline_pppoatm(int fd)
                be.encaps = PPPOATM_ENCAPS_LLC;
        else
                be.encaps = PPPOATM_ENCAPS_AUTODETECT;
+
        if (ioctl(fd, ATM_SETBACKEND, &be) < 0)
                fatal("ioctl(ATM_SETBACKEND): %m");
 }
@@ -168,7 +175,7 @@ static void disconnect_pppoatm(void)
 
 void plugin_init(void)
 {
-#if defined(__linux__)
+#ifdef linux
        extern int new_style_driver;    /* From sys-linux.c */
        if (!ppp_available() && !new_style_driver)
                fatal("Kernel doesn't support ppp_generic - "
@@ -176,19 +183,19 @@ void plugin_init(void)
 #else
        fatal("No PPPoATM support on this OS");
 #endif
-       info("PPPoATM plugin_init");
        add_options(pppoa_options);
 }
+
 struct channel pppoa_channel = {
-    options: pppoa_options,
-    process_extra_options: NULL,
-    check_options: NULL,
-    connect: &connect_pppoatm,
-    disconnect: &disconnect_pppoatm,
-    establish_ppp: &generic_establish_ppp,
-    disestablish_ppp: &generic_disestablish_ppp,
-    send_config: NULL,
-    recv_config: NULL,
-    close: NULL,
-    cleanup: NULL
+    .options = pppoa_options,
+    .process_extra_options = NULL,
+    .check_options = NULL,
+    .connect = &connect_pppoatm,
+    .disconnect = &disconnect_pppoatm,
+    .establish_ppp = &generic_establish_ppp,
+    .disestablish_ppp = &generic_disestablish_ppp,
+    .send_config = NULL,
+    .recv_config = NULL,
+    .close = NULL,
+    .cleanup = NULL
 };