Change log level
[l2tpns.git] / l2tpns.c
index 114981f..0838607 100644 (file)
--- a/l2tpns.c
+++ b/l2tpns.c
@@ -132,6 +132,7 @@ config_descriptt config_values[] = {
        CONFIG("ppp_restart_time", ppp_restart_time, INT),
        CONFIG("ppp_max_configure", ppp_max_configure, INT),
        CONFIG("ppp_max_failure", ppp_max_failure, INT),
+       CONFIG("ppp_keepalive", ppp_keepalive, BOOL),
        CONFIG("primary_dns", default_dns1, IPv4),
        CONFIG("secondary_dns", default_dns2, IPv4),
        CONFIG("primary_radius", radiusserver[0], IPv4),
@@ -162,6 +163,7 @@ config_descriptt config_values[] = {
        CONFIG("icmp_rate", icmp_rate, INT),
        CONFIG("packet_limit", max_packets, INT),
        CONFIG("cluster_address", cluster_address, IPv4),
+       CONFIG("cluster_port", cluster_port, INT),
        CONFIG("cluster_interface", cluster_interface, STRING),
        CONFIG("cluster_mcast_ttl", cluster_mcast_ttl, INT),
        CONFIG("cluster_hb_interval", cluster_hb_interval, INT),
@@ -2714,7 +2716,14 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr, uint16_t indexu
                                        result = 2; // general error
                                        error = 3; // reserved field non-zero
                                        msg = 0;
-                                       continue; // next
+                                       if (n == 0)
+                                       {
+                                               // if continue a infinity loop is created.
+                                               LOG(1, s, t, "It's infinite loop protection %02X\n", *b);
+                                               return;
+                                       }
+                                       else
+                                               continue; // next
                                }
                                b += 2;
                                if (*(uint16_t *) (b))
@@ -2724,7 +2733,14 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr, uint16_t indexu
                                        result = 2; // general error
                                        error = 6; // generic vendor-specific error
                                        msg = "unsupported vendor-specific";
-                                       continue; // next
+                                       if (n == 0)
+                                       {
+                                               // if continue a infinity loop is created.
+                                               LOG(1, s, t, "It's infinite loop protection %02X\n", *b);
+                                               return;
+                                       }
+                                       else
+                                               continue; // next
                                }
                                b += 2;
                                mtype = ntohs(*(uint16_t *) (b));
@@ -2784,7 +2800,7 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr, uint16_t indexu
                                        n = orig_len;
                                }
 
-                               LOG(4, s, t, "   AVP %u (%s) len %d%s%s\n", mtype, l2tp_avp_name(mtype), n,
+                               LOG(3, s, t, "   AVP %u (%s) len %d%s%s\n", mtype, l2tp_avp_name(mtype), n,
                                        flags & 0x40 ? ", hidden" : "", flags & 0x80 ? ", mandatory" : "");
 
                                switch (mtype)
@@ -2792,7 +2808,7 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr, uint16_t indexu
                                case 0:     // message type
                                        message = ntohs(*(uint16_t *) b);
                                        mandatory = flags & 0x80;
-                                       LOG(4, s, t, "   Message type = %u (%s)\n", message, l2tp_code(message));
+                                       LOG(3, s, t, "   Message type = %u (%s)\n", message, l2tp_code(message));
                                        break;
                                case 1:     // result code
                                        {
@@ -2815,15 +2831,15 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr, uint16_t indexu
                                                                cause = TERM_ADMIN_RESET;
                                                }
 
-                                               LOG(4, s, t, "   Result Code %u: %s\n", rescode, resdesc);
+                                               LOG(3, s, t, "   Result Code %u: %s\n", rescode, resdesc);
                                                if (n >= 4)
                                                {
                                                        uint16_t errcode = ntohs(*(uint16_t *)(b + 2));
                                                        errdesc = l2tp_error_code(errcode);
-                                                       LOG(4, s, t, "   Error Code %u: %s\n", errcode, errdesc);
+                                                       LOG(3, s, t, "   Error Code %u: %s\n", errcode, errdesc);
                                                }
                                                if (n > 4)
-                                                       LOG(4, s, t, "   Error String: %.*s\n", n-4, b+4);
+                                                       LOG(3, s, t, "   Error String: %.*s\n", n-4, b+4);
 
                                                if (cause && disc_cause_set < mtype) // take cause from attrib 46 in preference
                                                {
@@ -2838,7 +2854,7 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr, uint16_t indexu
                                case 2:     // protocol version
                                        {
                                                version = ntohs(*(uint16_t *) (b));
-                                               LOG(4, s, t, "   Protocol version = %u\n", version);
+                                               LOG(3, s, t, "   Protocol version = %u\n", version);
                                                if (version && version != 0x0100)
                                                {   // allow 0.0 and 1.0
                                                        LOG(1, s, t, "   Bad protocol version %04X\n", version);
@@ -2862,27 +2878,27 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr, uint16_t indexu
                                case 7:     // host name
                                        memset(tunnel[t].hostname, 0, sizeof(tunnel[t].hostname));
                                        memcpy(tunnel[t].hostname, b, (n < sizeof(tunnel[t].hostname)) ? n : sizeof(tunnel[t].hostname) - 1);
-                                       LOG(4, s, t, "   Tunnel hostname = \"%s\"\n", tunnel[t].hostname);
+                                       LOG(3, s, t, "   Tunnel hostname = \"%s\"\n", tunnel[t].hostname);
                                        // TBA - to send to RADIUS
                                        break;
                                case 8:     // vendor name
                                        memset(tunnel[t].vendor, 0, sizeof(tunnel[t].vendor));
                                        memcpy(tunnel[t].vendor, b, (n < sizeof(tunnel[t].vendor)) ? n : sizeof(tunnel[t].vendor) - 1);
-                                       LOG(4, s, t, "   Vendor name = \"%s\"\n", tunnel[t].vendor);
+                                       LOG(3, s, t, "   Vendor name = \"%s\"\n", tunnel[t].vendor);
                                        break;
                                case 9:     // assigned tunnel
                                        tunnel[t].far = ntohs(*(uint16_t *) (b));
-                                       LOG(4, s, t, "   Remote tunnel id = %u\n", tunnel[t].far);
+                                       LOG(3, s, t, "   Remote tunnel id = %u\n", tunnel[t].far);
                                        break;
                                case 10:    // rx window
                                        tunnel[t].window = ntohs(*(uint16_t *) (b));
                                        if (!tunnel[t].window)
                                                tunnel[t].window = 1; // window of 0 is silly
-                                       LOG(4, s, t, "   rx window = %u\n", tunnel[t].window);
+                                       LOG(3, s, t, "   rx window = %u\n", tunnel[t].window);
                                        break;
                                case 11:        // Request Challenge
                                        {
-                                               LOG(4, s, t, "   LAC requested CHAP authentication for tunnel\n");
+                                               LOG(3, s, t, "   LAC requested CHAP authentication for tunnel\n");
                                                if (message == 1)
                                                        build_chap_response(b, 2, n, &sendchalresponse);
                                                else if (message == 2)
@@ -2903,28 +2919,28 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr, uint16_t indexu
 
                                case 14:    // assigned session
                                        asession = session[s].far = ntohs(*(uint16_t *) (b));
-                                       LOG(4, s, t, "   assigned session = %u\n", asession);
+                                       LOG(3, s, t, "   assigned session = %u\n", asession);
                                        break;
                                case 15:    // call serial number
-                                       LOG(4, s, t, "   call serial number = %u\n", ntohl(*(uint32_t *)b));
+                                       LOG(3, s, t, "   call serial number = %u\n", ntohl(*(uint32_t *)b));
                                        break;
                                case 18:    // bearer type
-                                       LOG(4, s, t, "   bearer type = %u\n", ntohl(*(uint32_t *)b));
+                                       LOG(3, s, t, "   bearer type = %u\n", ntohl(*(uint32_t *)b));
                                        // TBA - for RADIUS
                                        break;
                                case 19:    // framing type
-                                       LOG(4, s, t, "   framing type = %u\n", ntohl(*(uint32_t *)b));
+                                       LOG(3, s, t, "   framing type = %u\n", ntohl(*(uint32_t *)b));
                                        // TBA
                                        break;
                                case 21:    // called number
                                        memset(called, 0, sizeof(called));
                                        memcpy(called, b, (n < sizeof(called)) ? n : sizeof(called) - 1);
-                                       LOG(4, s, t, "   Called <%s>\n", called);
+                                       LOG(3, s, t, "   Called <%s>\n", called);
                                        break;
                                case 22:    // calling number
                                        memset(calling, 0, sizeof(calling));
                                        memcpy(calling, b, (n < sizeof(calling)) ? n : sizeof(calling) - 1);
-                                       LOG(4, s, t, "   Calling <%s>\n", calling);
+                                       LOG(3, s, t, "   Calling <%s>\n", calling);
                                        break;
                                case 23:    // subtype
                                        break;
@@ -2941,7 +2957,7 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr, uint16_t indexu
                                                memcpy(tmp, b, (n < sizeof(tmp)) ? n : sizeof(tmp) - 1);
                                                session[s].tx_connect_speed = atol(tmp);
                                        }
-                                       LOG(4, s, t, "   TX connect speed <%u>\n", session[s].tx_connect_speed);
+                                       LOG(3, s, t, "   TX connect speed <%u>\n", session[s].tx_connect_speed);
                                        break;
                                case 38:    // rx connect speed
                                        if (n == 4)
@@ -2956,18 +2972,18 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr, uint16_t indexu
                                                memcpy(tmp, b, (n < sizeof(tmp)) ? n : sizeof(tmp) - 1);
                                                session[s].rx_connect_speed = atol(tmp);
                                        }
-                                       LOG(4, s, t, "   RX connect speed <%u>\n", session[s].rx_connect_speed);
+                                       LOG(3, s, t, "   RX connect speed <%u>\n", session[s].rx_connect_speed);
                                        break;
                                case 25:    // Physical Channel ID
                                        {
                                                uint32_t tmp = ntohl(*(uint32_t *) b);
-                                               LOG(4, s, t, "   Physical Channel ID <%X>\n", tmp);
+                                               LOG(3, s, t, "   Physical Channel ID <%X>\n", tmp);
                                                break;
                                        }
                                case 29:    // Proxy Authentication Type
                                        {
                                                uint16_t atype = ntohs(*(uint16_t *)b);
-                                               LOG(4, s, t, "   Proxy Auth Type %u (%s)\n", atype, ppp_auth_type(atype));
+                                               LOG(3, s, t, "   Proxy Auth Type %u (%s)\n", atype, ppp_auth_type(atype));
                                                break;
                                        }
                                case 30:    // Proxy Authentication Name
@@ -2975,23 +2991,23 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr, uint16_t indexu
                                                char authname[64];
                                                memset(authname, 0, sizeof(authname));
                                                memcpy(authname, b, (n < sizeof(authname)) ? n : sizeof(authname) - 1);
-                                               LOG(4, s, t, "   Proxy Auth Name (%s)\n",
+                                               LOG(3, s, t, "   Proxy Auth Name (%s)\n",
                                                        authname);
                                                break;
                                        }
                                case 31:    // Proxy Authentication Challenge
                                        {
-                                               LOG(4, s, t, "   Proxy Auth Challenge\n");
+                                               LOG(3, s, t, "   Proxy Auth Challenge\n");
                                                break;
                                        }
                                case 32:    // Proxy Authentication ID
                                        {
                                                uint16_t authid = ntohs(*(uint16_t *)(b));
-                                               LOG(4, s, t, "   Proxy Auth ID (%u)\n", authid);
+                                               LOG(3, s, t, "   Proxy Auth ID (%u)\n", authid);
                                                break;
                                        }
                                case 33:    // Proxy Authentication Response
-                                       LOG(4, s, t, "   Proxy Auth Response\n");
+                                       LOG(3, s, t, "   Proxy Auth Response\n");
                                        break;
                                case 27:    // last sent lcp
                                        {        // find magic number
@@ -3015,7 +3031,7 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr, uint16_t indexu
                                case 39:    // seq required - we control it as an LNS anyway...
                                        break;
                                case 36:    // Random Vector
-                                       LOG(4, s, t, "   Random Vector received.  Enabled AVP Hiding.\n");
+                                       LOG(3, s, t, "   Random Vector received.  Enabled AVP Hiding.\n");
                                        memset(session[s].random_vector, 0, sizeof(session[s].random_vector));
                                        if (n > sizeof(session[s].random_vector))
                                                n = sizeof(session[s].random_vector);
@@ -3029,7 +3045,7 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr, uint16_t indexu
                                                uint16_t proto = ntohs(*(uint16_t *) (b + 2));
                                                uint8_t dir = *(b + 4);
 
-                                               LOG(4, s, t, "   PPP disconnect cause "
+                                               LOG(3, s, t, "   PPP disconnect cause "
                                                        "(code=%u, proto=%04X, dir=%u, msg=\"%.*s\")\n",
                                                        code, proto, dir, n - 5, b + 5);
 
@@ -3780,8 +3796,10 @@ static void regular_cleanups(double period)
                }
 
                // No data in ECHO_TIMEOUT seconds, send LCP ECHO
-               if (session[s].ppp.phase >= Establish && (time_now - session[s].last_packet >= config->echo_timeout) &&
-                       (time_now - sess_local[s].last_echo >= ECHO_TIMEOUT))
+               if (session[s].ppp.phase >= Establish &&
+                    ((!config->ppp_keepalive) ||
+                     (time_now - session[s].last_packet >= config->echo_timeout)) &&
+                   (time_now - sess_local[s].last_echo >= ECHO_TIMEOUT))
                {
                        uint8_t b[MAXETHER];
 
@@ -4600,6 +4618,7 @@ static void initdata(int optdebug, char *optconfig)
        // Set default value echo_timeout and idle_echo_timeout
        config->echo_timeout = ECHO_TIMEOUT;
        config->idle_echo_timeout = IDLE_ECHO_TIMEOUT;
+       config->ppp_keepalive = 1;
        // Set default RDNSS lifetime
        config->dns6_lifetime = 1200;
 
@@ -5624,6 +5643,7 @@ static void update_config()
        memcpy(config->old_plugins, config->plugins, sizeof(config->plugins));
        if (!config->multi_read_count) config->multi_read_count = 10;
        if (!config->cluster_address) config->cluster_address = inet_addr(DEFAULT_MCAST_ADDR);
+       if (!config->cluster_port) config->cluster_port = CLUSTERPORT;
        if (!*config->cluster_interface)
                strncpy(config->cluster_interface, DEFAULT_MCAST_INTERFACE, sizeof(config->cluster_interface) - 1);