j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Allow list of environment variables to be passed to execute_script().

Browse source 
When executing host-up/down scripts, include the address and port of the
remote host.
This commit is contained in:
Guus Sliepen 2002-07-10 11:27:06 +00:00
parent a1bd878e11
commit 36cbaa32f4
4 changed files with 69 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
src/graph.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: graph.c,v 1.1.2.13 2002/06/21 10:11:12 guus Exp $ $Id: graph.c,v 1.1.2.14 2002/07/10 11:27:06 guus Exp $
*/ */
/* We need to generate two trees from the graph: /* We need to generate two trees from the graph:
@ -63,6 +63,7 @@
#include "edge.h" #include "edge.h"
#include "connection.h" #include "connection.h"
#include "process.h" #include "process.h"
#include "device.h"
#include "system.h" #include "system.h"
@ -157,6 +158,9 @@ void sssp_bfs(void)
avl_tree_t *todo_tree; avl_tree_t *todo_tree;
int indirect; int indirect;
char *name; char *name;
char *address, *port;
char *envp[7];
int i;
todo_tree = avl_alloc_tree(NULL, NULL); todo_tree = avl_alloc_tree(NULL, NULL);
@ -253,32 +257,40 @@ void sssp_bfs(void)
next = node->next; next = node->next;
n = (node_t *)node->data; n = (node_t *)node->data;
if(n->status.visited) if(n->status.visited ^ n->status.reachable)
{ {
if(!n->status.reachable) n->status.reachable = !n->status.reachable;
{ if(debug_lvl >= DEBUG_TRAFFIC)
if(debug_lvl >= DEBUG_TRAFFIC) if(n->status.reachable)
syslog(LOG_DEBUG, _("Node %s (%s) became reachable"), n->name, n->hostname); syslog(LOG_DEBUG, _("Node %s (%s) became reachable"), n->name, n->hostname);
n->status.reachable = 1; else
asprintf(&name, "hosts/%s-up", n->name); syslog(LOG_DEBUG, _("Node %s (%s) became unreachable"), n->name, n->hostname);
execute_script(name);
free(name); if(!n->status.reachable)
} {
} n->status.reachable = 0;
else n->status.validkey = 0;
{ n->status.waitingforkey = 0;
if(n->status.reachable) n->sent_seqno = 0;
{ }
if(debug_lvl >= DEBUG_TRAFFIC)
syslog(LOG_DEBUG, _("Node %s (%s) became unreachable"), n->name, n->hostname); asprintf(&envp[0], "NETNAME=%s", netname?netname:"");
n->status.reachable = 0; asprintf(&envp[1], "DEVICE=%s", device?device:"");
n->status.validkey = 0; asprintf(&envp[2], "INTERFACE=%s", interface?interface:"");
n->status.waitingforkey = 0; asprintf(&envp[3], "NODE=%s", n->name);
n->sent_seqno = 0; sockaddr2str(&n->address, &address, &port);
asprintf(&name, "hosts/%s-down", n->name); asprintf(&envp[4], "REMOTEADDRESS=%s", address);
execute_script(name); asprintf(&envp[5], "REMOTEPORT=%s", port);
free(name); envp[6] = NULL;
}
asprintf(&name, n->status.reachable?"hosts/%s-up":"hosts/%s-down", n->name);
execute_script(name, envp);
free(name);
free(address);
free(port);
for(i = 0; i < 7; i++)
free(envp[i]);
} }
} }
} }

25
src/net_setup.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: net_setup.c,v 1.1.2.20 2002/06/21 10:11:12 guus Exp $ $Id: net_setup.c,v 1.1.2.21 2002/07/10 11:27:06 guus Exp $
*/ */
#include "config.h" #include "config.h"
@ -523,6 +523,8 @@ cp
*/ */
int setup_network_connections(void) int setup_network_connections(void)
{ {
char *envp[4];
int i;
cp cp
now = time(NULL); now = time(NULL);
@ -547,7 +549,15 @@ cp
return -1; return -1;
/* Run tinc-up script to further initialize the tap interface */ /* Run tinc-up script to further initialize the tap interface */
execute_script("tinc-up"); asprintf(&envp[0], "NETNAME=%s", netname?netname:"");
asprintf(&envp[1], "DEVICE=%s", device?device:"");
asprintf(&envp[2], "INTERFACE=%s", interface?interface:"");
envp[3] = NULL;
execute_script("tinc-up", envp);
for(i = 0; i < 4; i++)
free(envp[i]);
if(setup_myself() < 0) if(setup_myself() < 0)
return -1; return -1;
@ -564,6 +574,7 @@ void close_network_connections(void)
{ {
avl_node_t *node, *next; avl_node_t *node, *next;
connection_t *c; connection_t *c;
char *envp[4];
int i; int i;
cp cp
for(node = connection_tree->head; node; node = next) for(node = connection_tree->head; node; node = next)
@ -591,7 +602,15 @@ cp
exit_nodes(); exit_nodes();
exit_connections(); exit_connections();
execute_script("tinc-down"); asprintf(&envp[0], "NETNAME=%s", netname?netname:"");
asprintf(&envp[1], "DEVICE=%s", device?device:"");
asprintf(&envp[2], "INTERFACE=%s", interface?interface:"");
envp[3] = NULL;
execute_script("tinc-down", envp);
for(i = 0; i < 4; i++)
free(envp[i]);
close_device(); close_device();
cp cp

37
src/process.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: process.c,v 1.1.2.41 2002/06/21 10:11:13 guus Exp $ $Id: process.c,v 1.1.2.42 2002/07/10 11:27:06 guus Exp $
*/ */
#include "config.h" #include "config.h"
@ -207,35 +207,14 @@ cp
Execute the program name, with sane environment. All output will be Execute the program name, with sane environment. All output will be
redirected to syslog. redirected to syslog.
*/ */
void _execute_script(const char *scriptname) __attribute__ ((noreturn)); void _execute_script(const char *scriptname, char **envp) __attribute__ ((noreturn));
void _execute_script(const char *scriptname) void _execute_script(const char *scriptname, char **envp)
{ {
char *s; char *s;
cp cp
#ifdef HAVE_UNSETENV while(*envp)
unsetenv("NETNAME"); putenv(*envp++);
unsetenv("DEVICE");
unsetenv("INTERFACE");
#endif
if(netname)
{
asprintf(&s, "NETNAME=%s", netname);
putenv(s); /* Don't free s! see man 3 putenv */
}
if(device)
{
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 */
}
chdir("/"); chdir("/");
/* Close all file descriptors */ /* Close all file descriptors */
@ -253,7 +232,7 @@ cp
/* /*
Fork and execute the program pointed to by name. Fork and execute the program pointed to by name.
*/ */
int execute_script(const char *name) int execute_script(const char *name, char **envp)
{ {
pid_t pid; pid_t pid;
int status; int status;
@ -313,7 +292,7 @@ cp
cp cp
/* Child here */ /* Child here */
_execute_script(scriptname); _execute_script(scriptname, envp);
} }

4
src/process.h
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: process.h,v 1.1.2.11 2002/06/21 10:11:13 guus Exp $ $Id: process.h,v 1.1.2.12 2002/07/10 11:27:06 guus Exp $
*/ */
#ifndef __TINC_PROCESS_H__ #ifndef __TINC_PROCESS_H__
@ -28,7 +28,7 @@
extern int do_detach; extern int do_detach;
extern void setup_signals(void); extern void setup_signals(void);
extern int execute_script(const char *); extern int execute_script(const char *, char **);
extern int detach(void); extern int detach(void);
extern int kill_other(int); extern int kill_other(int);
extern void cleanup_and_exit(int); extern void cleanup_and_exit(int);