along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: net.c,v 1.35.4.68 2000/11/07 21:43:28 guus Exp $
+ $Id: net.c,v 1.35.4.74 2000/11/15 22:07:36 zarq Exp $
*/
#include "config.h"
-#include <arpa/inet.h>
#include <errno.h>
#include <fcntl.h>
-#include <linux/sockios.h>
-#include <net/if.h>
#include <netdb.h>
#include <netinet/in.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/signal.h>
-#include <sys/socket.h>
#include <sys/time.h>
#include <sys/types.h>
#include <syslog.h>
#include <unistd.h>
#include <sys/ioctl.h>
-#include <openssl/rand.h>
-#include <openssl/evp.h>
-#include <openssl/err.h>
+/* SunOS really wants sys/socket.h BEFORE net/if.h,
+ and FreeBSD wants these lines below the rest. */
+#include <arpa/inet.h>
+#include <sys/socket.h>
+#include <net/if.h>
+
+#ifdef HAVE_OPENSSL_RAND_H
+# include <openssl/rand.h>
+#else
+# include <rand.h>
+#endif
+
+#ifdef HAVE_OPENSSL_EVP_H
+# include <openssl/evp.h>
+#else
+# include <evp.h>
+#endif
+
+#ifdef HAVE_OPENSSL_ERR_H
+# include <openssl/err.h>
+#else
+# include <err.h>
+#endif
#ifdef HAVE_TUNTAP
#include LINUX_IF_TUN_H
#include "conf.h"
#include "connlist.h"
+#include "list.h"
#include "meta.h"
#include "net.h"
#include "netutl.h"
subnet_t mymac;
+list_t *child_pids;
+
+void _execute_script(const char *name)
+{
+ int error = 0;
+ char *scriptname;
+ char *s;
+ int fd;
+
+ if(netname)
+ {
+ asprintf(&s, "NETNAME=%s", netname);
+ putenv(s); /* Don't free s! see man 3 putenv */
+ }
+#ifdef HAVE_UNSETENV
+ else
+ {
+ unsetenv("NETNAME");
+ }
+#endif
+
+ if(chdir(confbase) < 0)
+ /* This cannot fail since we already read config files from this
+ directory. - Guus */
+ /* Yes this can fail, somebody could have removed this directory
+ when we didn't pay attention. - Ivo */
+ {
+ if(chdir("/") < 0)
+ /* Now if THIS fails, something wicked is going on. - Ivo */
+ syslog(LOG_ERR, _("Couldn't chdir to `/': %m"));
+
+ /* Continue anyway. */
+ }
+
+ asprintf(&scriptname, "%s/%s", confbase, name);
+
+ /* Close all file descriptors */
+ closelog();
+ fcloseall();
+
+ /* Open standard input */
+ if(open("/dev/null", O_RDONLY) < 0)
+ {
+ syslog(LOG_ERR, _("Opening `/dev/null' failed: %m"));
+ error = 1;
+ }
+
+ if(!error)
+ {
+ /* Standard output directly goes to syslog */
+ openlog(name, LOG_CONS | LOG_PID, LOG_DAEMON);
+ /* Standard error as well */
+ if(dup2(1, 2) < 0)
+ {
+ syslog(LOG_ERR, _("System call `%s' failed: %m"),
+ "dup2");
+ error = 1;
+ }
+ }
+
+ if(error && debug_lvl > 1)
+ syslog(LOG_INFO, _("This means that any output the script generates will not be shown in syslog."));
+
+ execl(scriptname, NULL);
+ /* No return on success */
+
+ if(errno != ENOENT) /* Ignore if the file does not exist */
+ syslog(LOG_WARNING, _("Error executing `%s': %m"), scriptname);
+
+ /* No need to free things */
+ exit(0);
+}
+
/*
Execute the given script.
This function doesn't really belong here.
*/
int execute_script(const char *name)
{
- char *scriptname;
pid_t pid;
- char *s;
if((pid = fork()) < 0)
{
if(pid)
{
+ list_append(child_pids, pid);
return 0;
}
/* Child here */
- if(netname)
- {
- asprintf(&s, "NETNAME=%s", netname);
- putenv(s); /* Don't free s! see man 3 putenv */
- }
- else
- {
- unsetenv("NETNAME");
- }
-
- chdir(confbase); /* This cannot fail since we already read config files from this directory. */
-
- asprintf(&scriptname, "%s/%s", confbase, name);
- execl(scriptname, NULL);
+ _execute_script(name);
+}
- /* No return on success */
-
- if(errno != ENOENT) /* Ignore if the file does not exist */
- syslog(LOG_WARNING, _("Error executing `%s': %m"), scriptname);
+int check_child(void *data)
+{
+ pid_t pid;
+ int status;
- /* No need to free things */
+ pid = (pid_t) data;
+ pid = waitpid(pid, &status, WNOHANG);
+ if(WIFEXITED(status))
+ {
+ if(WIFSIGNALED(status)) /* Child was killed by a signal */
+ {
+ syslog(LOG_ERR, _("Child with PID %d was killed by signal %d (%s)"),
+ pid, WTERMSIG(status), strsignal(WTERMSIG(status)));
+ return -1;
+ }
+ if(WEXITSTATUS(status) != 0)
+ {
+ syslog(LOG_INFO, _("Child with PID %d exited with code %d"),
+ WEXITSTATUS(status));
+ }
+ return -1;
+ }
+}
- exit(0);
+void check_children(void)
+{
+ list_forall_nodes(child_pids, check_child);
}
int xsend(conn_list_t *cl, vpn_packet_t *inpkt)
if(setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)))
{
+ close(nfd);
syslog(LOG_ERR, _("System call `%s' failed: %m"),
"setsockopt");
return -1;
if(setsockopt(nfd, SOL_SOCKET, SO_KEEPALIVE, &one, sizeof(one)))
{
+ close(nfd);
syslog(LOG_ERR, _("System call `%s' failed: %m"),
"setsockopt");
return -1;
flags = fcntl(nfd, F_GETFL);
if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0)
{
+ close(nfd);
syslog(LOG_ERR, _("System call `%s' failed: %m"),
"fcntl");
return -1;
{
if(setsockopt(nfd, SOL_SOCKET, SO_KEEPALIVE, cfg->data.ptr, strlen(cfg->data.ptr)))
{
+ close(nfd);
syslog(LOG_ERR, _("Unable to bind listen socket to interface %s: %m"), cfg->data.ptr);
return -1;
}
if(bind(nfd, (struct sockaddr *)&a, sizeof(struct sockaddr)))
{
+ close(nfd);
syslog(LOG_ERR, _("Can't bind to port %hd/tcp: %m"), port);
return -1;
}
if(listen(nfd, 3))
{
+ close(nfd);
syslog(LOG_ERR, _("System call `%s' failed: %m"),
"listen");
return -1;
cp
if((nfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0)
{
+ close(nfd);
syslog(LOG_ERR, _("Creating socket failed: %m"));
return -1;
}
if(setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)))
{
+ close(nfd);
syslog(LOG_ERR, _("System call `%s' failed: %m"),
"setsockopt");
return -1;
flags = fcntl(nfd, F_GETFL);
if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0)
{
+ close(nfd);
syslog(LOG_ERR, _("System call `%s' failed: %m"),
"fcntl");
return -1;
if(bind(nfd, (struct sockaddr *)&a, sizeof(struct sockaddr)))
{
+ close(nfd);
syslog(LOG_ERR, _("Can't bind to port %hd/udp: %m"), port);
return -1;
}
if(connect(cl->meta_socket, (struct sockaddr *)&a, sizeof(a)) == -1)
{
+ close(cl->meta_socket);
syslog(LOG_ERR, _("%s port %hd: %m"), cl->hostname, cl->port);
return -1;
}
flags = fcntl(cl->meta_socket, F_GETFL);
if(fcntl(cl->meta_socket, F_SETFL, flags | O_NONBLOCK) < 0)
{
+ close(cl->meta_socket);
syslog(LOG_ERR, _("fcntl for %s port %d: %m"),
cl->hostname, cl->port);
return -1;
myself->status.active = 1;
syslog(LOG_NOTICE, _("Ready: listening on port %hd"), myself->port);
+
+ child_pids = list_new();
cp
return 0;
}
if(setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)))
{
+ close(nfd);
syslog(LOG_ERR, _("System call `%s' failed: %m"),
"setsockopt");
return -1;
flags = fcntl(nfd, F_GETFL);
if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0)
{
+ close(nfd);
syslog(LOG_ERR, _("System call `%s' failed: %m"),
"fcntl");
return -1;
if(bind(nfd, (struct sockaddr *)&a, sizeof(struct sockaddr)))
{
+ close(nfd);
syslog(LOG_ERR, _("Can't bind to port %hd/udp: %m"), myself->port);
return -1;
}
if(connect(nfd, (struct sockaddr *)&a, sizeof(a)) == -1)
{
+ close(nfd);
syslog(LOG_ERR, _("Connecting to %s port %d failed: %m"),
cl->hostname, cl->port);
return -1;
flags = fcntl(nfd, F_GETFL);
if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0)
{
+ close(nfd);
syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m %s (%s)"), __FILE__, __LINE__, nfd,
cl->name, cl->hostname);
return -1;
cp
p = new_conn_list();
- if(getpeername(sfd, &ci, &len) < 0)
+ if(getpeername(sfd, (struct sockaddr *) &ci, (socklen_t *) &len) < 0)
{
syslog(LOG_ERR, _("System call `%s' failed: %m"),
"getpeername");
if(FD_ISSET(tap_fd, &fset))
handle_tap_input();
}
+
+ check_children();
}
cp
}
projects / tinc / blobdiff