welterde/l2tpns
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drop backtrace

Browse source
This commit is contained in:
Brendan O'Dea 2005-12-14 02:19:15 +00:00
parent d14808035d
commit 5151ca4054
5 changed files with 11 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Changes
View file

@ -1,3 +1,6 @@
* Wed Dec 14 2005 Brendan O'Dea <bod@optus.net> 2.1.15
- Drop backtrace.
* Fri Dec 9 2005 Brendan O'Dea <bod@optus.net> 2.1.14 * Fri Dec 9 2005 Brendan O'Dea <bod@optus.net> 2.1.14
- Run PLUGIN_RADIUS_ACCOUNT for Start records. - Run PLUGIN_RADIUS_ACCOUNT for Start records.

6
l2tpns.c
View file

@ -4,7 +4,7 @@
// Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced // Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced
// vim: sw=8 ts=8 // vim: sw=8 ts=8
char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.151 2005-12-07 05:21:37 bodea Exp $"; char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.152 2005-12-14 02:19:15 bodea Exp $";
#include <arpa/inet.h> #include <arpa/inet.h>
#include <assert.h> #include <assert.h>
@ -940,18 +940,14 @@ void tunnelsend(uint8_t * buf, uint16_t l, tunnelidt t)
if (!t) if (!t)
{ {
static int backtrace_count = 0;
LOG(0, 0, t, "tunnelsend called with 0 as tunnel id\n"); LOG(0, 0, t, "tunnelsend called with 0 as tunnel id\n");
STAT(tunnel_tx_errors); STAT(tunnel_tx_errors);
log_backtrace(backtrace_count, 5)
return; return;
} }
if (!tunnel[t].ip) 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(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); STAT(tunnel_tx_errors);
return; return;
} }

21
l2tpns.h
View file

@ -1,11 +1,10 @@
// L2TPNS Global Stuff // L2TPNS Global Stuff
// $Id: l2tpns.h,v 1.106 2005-12-09 00:43:17 bodea Exp $ // $Id: l2tpns.h,v 1.107 2005-12-14 02:19:15 bodea Exp $
#ifndef __L2TPNS_H__ #ifndef __L2TPNS_H__
#define __L2TPNS_H__ #define __L2TPNS_H__
#include <netinet/in.h> #include <netinet/in.h>
#include <execinfo.h>
#include <stdio.h> #include <stdio.h>
#include <signal.h> #include <signal.h>
#include <stdlib.h> #include <stdlib.h>
@ -15,7 +14,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <libcli.h> #include <libcli.h>
#define VERSION "2.1.14" #define VERSION "2.1.15"
// Limits // Limits
#define MAXTUNNEL 500 // could be up to 65535 #define MAXTUNNEL 500 // could be up to 65535
@ -741,6 +740,7 @@ int cmd_show_hist_open(struct cli_def *cli, char *command, char **argv, int argc
void _log(int level, sessionidt s, tunnelidt t, const char *format, ...) __attribute__((format (printf, 4, 5))); void _log(int level, sessionidt s, tunnelidt t, const char *format, ...) __attribute__((format (printf, 4, 5)));
void _log_hex(int level, const char *title, const uint8_t *data, int maxsize); void _log_hex(int level, const char *title, const uint8_t *data, int maxsize);
int sessionsetup(sessionidt s, tunnelidt t); int sessionsetup(sessionidt s, tunnelidt t);
int run_plugins(int plugin_type, void *data); int run_plugins(int plugin_type, void *data);
void rebuild_address_pool(void); void rebuild_address_pool(void);
@ -766,21 +766,6 @@ extern sessionlocalt *sess_local;
extern ippoolt *ip_address_pool; extern ippoolt *ip_address_pool;
#define sessionfree (session[0].next) #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 configt *config;
extern time_t basetime; // Time when this process started. extern time_t basetime; // Time when this process started.

6
l2tpns.spec
View file

@ -1,6 +1,6 @@
Summary: A high-speed clustered L2TP LNS Summary: A high-speed clustered L2TP LNS
Name: l2tpns Name: l2tpns
Version: 2.1.14 Version: 2.1.15
Release: 1 Release: 1
License: GPL License: GPL
Group: System Environment/Daemons Group: System Environment/Daemons
@ -43,5 +43,5 @@ rm -rf %{buildroot}
%attr(644,root,root) /usr/share/man/man[58]/* %attr(644,root,root) /usr/share/man/man[58]/*
%changelog %changelog
* Fri Dec 9 2005 Brendan O'Dea <bod@optus.net> 2.1.14-1 * Wed Dec 14 2005 Brendan O'Dea <bod@optus.net> 2.1.15-1
- 2.1.14 release, see /usr/share/doc/l2tpns-2.1.14/Changes - 2.1.15 release, see /usr/share/doc/l2tpns-2.1.15/Changes

6
ppp.c
View file

@ -1,6 +1,6 @@
// L2TPNS PPP Stuff // L2TPNS PPP Stuff
char const *cvs_id_ppp = "$Id: ppp.c,v 1.88 2005-12-07 05:21:37 bodea Exp $"; char const *cvs_id_ppp = "$Id: ppp.c,v 1.89 2005-12-14 02:19:15 bodea Exp $";
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@ -1755,9 +1755,7 @@ uint8_t *makeppp(uint8_t *b, int size, uint8_t *p, int l, sessionidt s, tunnelid
{ {
if (size < 12) // Need more space than this!! 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(0, s, t, "makeppp buffer too small for L2TP header (size=%d)\n", size);
log_backtrace(backtrace_count, 5)
return NULL; return NULL;
} }
@ -1780,9 +1778,7 @@ uint8_t *makeppp(uint8_t *b, int size, uint8_t *p, int l, sessionidt s, tunnelid
if (l + 12 > size) 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(2, s, t, "makeppp would overflow buffer (size=%d, header+payload=%d)\n", size, l + 12);
log_backtrace(backtrace_count, 5)
return NULL; return NULL;
} }