projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use PEM functions as suggested by OpenSSL docs.
[tinc]
/
src
/
process.c
diff --git
a/src/process.c
b/src/process.c
index
9acb5fd
..
7c8d31f
100644
(file)
--- a/
src/process.c
+++ b/
src/process.c
@@
-17,7
+17,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: process.c,v 1.1.2.
26 2001/10/27 12:13:17
guus Exp $
+ $Id: process.c,v 1.1.2.
31 2001/10/31 20:37:54
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-44,6
+44,7
@@
#include "subnet.h"
#include "device.h"
#include "connection.h"
#include "subnet.h"
#include "device.h"
#include "connection.h"
+#include "device.h"
#include "system.h"
#include "system.h"
@@
-199,17
+200,29
@@
void _execute_script(const char *name)
char *scriptname;
char *s;
cp
char *scriptname;
char *s;
cp
+#ifdef HAVE_UNSETENV
+ unsetenv("NETNAME");
+ unsetenv("DEVICE");
+ unsetenv("INTERFACE");
+#endif
+
if(netname)
{
asprintf(&s, "NETNAME=%s", netname);
putenv(s); /* Don't free s! see man 3 putenv */
}
if(netname)
{
asprintf(&s, "NETNAME=%s", netname);
putenv(s); /* Don't free s! see man 3 putenv */
}
-#ifdef HAVE_UNSETENV
- else
+
+ if(device)
{
{
- unsetenv("NETNAME");
+ asprintf(&s, "DEVICE=%s", device);
+ putenv(s); /* Don't free s! see man 3 putenv */
+ }
+
+ if(interface)
+ {
+ asprintf(&s, "INTERFACE=%s", interface);
+ putenv(s); /* Don't free s! see man 3 putenv */
}
}
-#endif
chdir("/");
chdir("/");
@@
-372,13
+385,16
@@
sigint_handler(int a, siginfo_t *info, void *b)
RETSIGTYPE
sigusr1_handler(int a, siginfo_t *info, void *b)
{
RETSIGTYPE
sigusr1_handler(int a, siginfo_t *info, void *b)
{
- dump_connection
_list
();
+ dump_connection
s
();
}
RETSIGTYPE
sigusr2_handler(int a, siginfo_t *info, void *b)
{
}
RETSIGTYPE
sigusr2_handler(int a, siginfo_t *info, void *b)
{
- dump_subnet_list();
+ dump_device_stats();
+ dump_nodes();
+ dump_edges();
+ dump_subnets();
}
RETSIGTYPE
}
RETSIGTYPE
@@
-393,7
+409,7
@@
ignore_signal_handler(int a, siginfo_t *info, void *b)
{
if(debug_lvl >= DEBUG_SCARY_THINGS)
{
{
if(debug_lvl >= DEBUG_SCARY_THINGS)
{
- syslog(LOG_
WARNING, _("Got unexpect
ed signal %d (%s)"), a, strsignal(a));
+ syslog(LOG_
DEBUG, _("Ignor
ed signal %d (%s)"), a, strsignal(a));
cp_trace();
}
}
cp_trace();
}
}
@@
-434,6
+450,10
@@
setup_signals(void)
sigaction(i, &act, NULL);
}
sigaction(i, &act, NULL);
}
+ /* If we didn't detach, allow coredumps */
+ if(!do_detach)
+ sighandlers[3].handler = SIG_DFL;
+
/* Then, for each known signal that we want to catch, assign a
handler to the signal, with error checking this time. */
for(i = 0; sighandlers[i].signal; i++)
/* Then, for each known signal that we want to catch, assign a
handler to the signal, with error checking this time. */
for(i = 0; sighandlers[i].signal; i++)