source: freewrt/package/l2tpns/patches/01-honor_includes_remove_backtrace.patch@ 6fc4520e

l2tpns-2.1.14/Makefile

@@ -11 +11 @@
 DEFINES += -DETCDIR='"$(etcdir)"'
 
 OPTIM =
-OPTIM += -g
 OPTIM += -O3
 
-CC = gcc
-LD = gcc
-INCLUDES = -I.
+INCLUDES = -I. -I$(STAGING_DIR)/usr/include
 CPPFLAGS = $(INCLUDES) $(DEFINES)
 CFLAGS = -Wall -Wformat-security -Wno-format-zero-length $(OPTIM)
-LDFLAGS =
+LDFLAGS = -L$(STAGING_DIR)/usr/lib
 LDLIBS =
-INSTALL = install -c -D -o root -g root
+INSTALL = install -c -D
 
 l2tpns.LIBS = -lm -lcli -ldl
 

l2tpns-2.1.14/l2tpns.c

@@ -940 +940 @@
 
         if (!t)
         {
-                static int backtrace_count = 0;
                 LOG(0, 0, t, "tunnelsend called with 0 as tunnel id\n");
                 STAT(tunnel_tx_errors);
-                log_backtrace(backtrace_count, 5)
                 return;
         }
 
         if (!tunnel[t].ip)
         {
-                static int backtrace_count = 0;
                 LOG(1, 0, t, "Error sending data out tunnel: no remote endpoint (tunnel not set up)\n");
-                log_backtrace(backtrace_count, 5)
                 STAT(tunnel_tx_errors);
                 return;
         }
@@ -4125 +4121 @@
                 struct sched_param params = {0};
                 params.sched_priority = 1;
 
-                if (get_nprocs() < 2)
-                {
-                        LOG(0, 0, 0, "Not using FIFO scheduler, there is only 1 processor in the system.\n");
-                        config->scheduler_fifo = 0;
-                }
-                else
-                {
-                        if ((ret = sched_setscheduler(0, SCHED_FIFO, &params)) == 0)
-                        {
-                                LOG(1, 0, 0, "Using FIFO scheduler.  Say goodbye to any other processes running\n");
-                        }
-                        else
-                        {
-                                LOG(0, 0, 0, "Error setting scheduler to FIFO: %s\n", strerror(errno));
-                                config->scheduler_fifo = 0;
-                        }
-                }
+                LOG(0, 0, 0, "Not using FIFO scheduler, there is only 1 processor in the system.\n");
+                config->scheduler_fifo = 0;
         }
 
         /* Set up the cluster communications port. */

l2tpns-2.1.14/l2tpns.h

@@ -5 +5 @@
 #define __L2TPNS_H__
 
 #include <netinet/in.h>
-#include <execinfo.h>
 #include <stdio.h>
 #include <signal.h>
 #include <stdlib.h>
@@ -766 +765 @@
 extern ippoolt *ip_address_pool;
 #define sessionfree (session[0].next)
 
-#define log_backtrace(count, max) \
-if (count++ < max) { \
-        void *array[20]; \
-        char **strings; \
-        int size, i; \
-        LOG(0, 0, t, "Backtrace follows:\n"); \
-        size = backtrace(array, 10); \
-        strings = backtrace_symbols(array, size); \
-        if (strings) for (i = 0; i < size; i++) \
-        { \
-                LOG(0, 0, t, " %s\n", strings[i]); \
-        } \
-        free(strings); \
-}
-
 
 extern configt *config;
 extern time_t basetime;         // Time when this process started.

l2tpns-2.1.14/ppp.c

@@ -1755 +1755 @@
 {
         if (size < 12) // Need more space than this!!
         {
-                static int backtrace_count = 0;
                 LOG(0, s, t, "makeppp buffer too small for L2TP header (size=%d)\n", size);
-                log_backtrace(backtrace_count, 5)
                 return NULL;
         }
 
@@ -1780 +1778 @@
 
         if (l + 12 > size)
         {
-                static int backtrace_count = 0;
                 LOG(2, s, t, "makeppp would overflow buffer (size=%d, header+payload=%d)\n", size, l + 12);
-                log_backtrace(backtrace_count, 5)
                 return NULL;
         }