projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Also check for rand.h and err.h. If any of these files does not
[tinc]
/
src
/
net.c
diff --git
a/src/net.c
b/src/net.c
index
a4324a4
..
0a23212
100644
(file)
--- a/
src/net.c
+++ b/
src/net.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: net.c,v 1.35.4.
67 2000/11/04 22:57:30
guus Exp $
+ $Id: net.c,v 1.35.4.
70 2000/11/08 17:56:34
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-25,7
+25,8
@@
#include <arpa/inet.h>
#include <errno.h>
#include <fcntl.h>
#include <arpa/inet.h>
#include <errno.h>
#include <fcntl.h>
-#include <linux/sockios.h>
+/* SunOS really wants sys/socket.h BEFORE net/if.h */
+#include <sys/socket.h>
#include <net/if.h>
#include <netdb.h>
#include <netinet/in.h>
#include <net/if.h>
#include <netdb.h>
#include <netinet/in.h>
@@
-33,7
+34,6
@@
#include <stdlib.h>
#include <string.h>
#include <sys/signal.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 <sys/time.h>
#include <sys/types.h>
#include <syslog.h>
@@
-74,7
+74,6
@@
int keylifetime = 0;
int keyexpires = 0;
char *unknown = NULL;
int keyexpires = 0;
char *unknown = NULL;
-char *interface_name = NULL; /* Contains the name of the interface */
subnet_t mymac;
subnet_t mymac;
@@
-82,7
+81,7
@@
subnet_t mymac;
Execute the given script.
This function doesn't really belong here.
*/
Execute the given script.
This function doesn't really belong here.
*/
-int execute_script(const char
*
name)
+int execute_script(const char
*
name)
{
char *scriptname;
pid_t pid;
{
char *scriptname;
pid_t pid;
@@
-102,35
+101,30
@@
int execute_script(const char* name)
/* Child here */
/* Child here */
- asprintf(&scriptname, "%s/%s", confbase, name);
- asprintf(&s, "IFNAME=%s", interface_name);
- putenv(s);
- free(s);
-
if(netname)
{
asprintf(&s, "NETNAME=%s", netname);
if(netname)
{
asprintf(&s, "NETNAME=%s", netname);
- putenv(s);
- free(s);
+ putenv(s); /* Don't free s! see man 3 putenv */
}
}
+#ifdef HAVE_UNSETENV
else
{
unsetenv("NETNAME");
}
else
{
unsetenv("NETNAME");
}
+#endif
- if(chdir(confbase) < 0)
- {
- syslog(LOG_ERR, _("Couldn't chdir to `%s': %m"),
- confbase);
- }
+ chdir(confbase); /* This cannot fail since we already read config files from this directory. */
+ asprintf(&scriptname, "%s/%s", confbase, name);
execl(scriptname, NULL);
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 */
/* 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);
}
exit(0);
}
@@
-463,18
+457,11
@@
cp
strncpy(ifr.ifr_name, netname, IFNAMSIZ);
cp
if (!ioctl(tap_fd, TUNSETIFF, (void *) &ifr))
strncpy(ifr.ifr_name, netname, IFNAMSIZ);
cp
if (!ioctl(tap_fd, TUNSETIFF, (void *) &ifr))
- {
+ {
syslog(LOG_INFO, _("%s is a new style tun/tap device"), tapfname);
taptype = TAP_TYPE_TUNTAP;
}
#endif
syslog(LOG_INFO, _("%s is a new style tun/tap device"), tapfname);
taptype = TAP_TYPE_TUNTAP;
}
#endif
-
- /* Add name of network interface to environment (for scripts) */
-
- ioctl(tap_fd, SIOCGIFNAME, (void *) &ifr);
- interface_name = xmalloc(strlen(ifr.ifr_name));
- strcpy(interface_name, ifr.ifr_name);
-
cp
return 0;
}
cp
return 0;
}
@@
-498,6
+485,7
@@
cp
if(setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)))
{
if(setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)))
{
+ close(nfd);
syslog(LOG_ERR, _("System call `%s' failed: %m"),
"setsockopt");
return -1;
syslog(LOG_ERR, _("System call `%s' failed: %m"),
"setsockopt");
return -1;
@@
-505,6
+493,7
@@
cp
if(setsockopt(nfd, SOL_SOCKET, SO_KEEPALIVE, &one, sizeof(one)))
{
if(setsockopt(nfd, SOL_SOCKET, SO_KEEPALIVE, &one, sizeof(one)))
{
+ close(nfd);
syslog(LOG_ERR, _("System call `%s' failed: %m"),
"setsockopt");
return -1;
syslog(LOG_ERR, _("System call `%s' failed: %m"),
"setsockopt");
return -1;
@@
-513,6
+502,7
@@
cp
flags = fcntl(nfd, F_GETFL);
if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0)
{
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;
syslog(LOG_ERR, _("System call `%s' failed: %m"),
"fcntl");
return -1;
@@
-522,6
+512,7
@@
cp
{
if(setsockopt(nfd, SOL_SOCKET, SO_KEEPALIVE, cfg->data.ptr, strlen(cfg->data.ptr)))
{
{
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;
}
syslog(LOG_ERR, _("Unable to bind listen socket to interface %s: %m"), cfg->data.ptr);
return -1;
}
@@
-538,12
+529,14
@@
cp
if(bind(nfd, (struct sockaddr *)&a, sizeof(struct sockaddr)))
{
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))
{
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;
syslog(LOG_ERR, _("System call `%s' failed: %m"),
"listen");
return -1;
@@
-564,12
+557,14
@@
int setup_vpn_in_socket(int port)
cp
if((nfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0)
{
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)))
{
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;
syslog(LOG_ERR, _("System call `%s' failed: %m"),
"setsockopt");
return -1;
@@
-578,6
+573,7
@@
cp
flags = fcntl(nfd, F_GETFL);
if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0)
{
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;
syslog(LOG_ERR, _("System call `%s' failed: %m"),
"fcntl");
return -1;
@@
-590,6
+586,7
@@
cp
if(bind(nfd, (struct sockaddr *)&a, sizeof(struct sockaddr)))
{
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;
}
syslog(LOG_ERR, _("Can't bind to port %hd/udp: %m"), port);
return -1;
}
@@
-628,6
+625,7
@@
cp
if(connect(cl->meta_socket, (struct sockaddr *)&a, sizeof(a)) == -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;
}
syslog(LOG_ERR, _("%s port %hd: %m"), cl->hostname, cl->port);
return -1;
}
@@
-635,6
+633,7
@@
cp
flags = fcntl(cl->meta_socket, F_GETFL);
if(fcntl(cl->meta_socket, F_SETFL, flags | O_NONBLOCK) < 0)
{
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;
syslog(LOG_ERR, _("fcntl for %s port %d: %m"),
cl->hostname, cl->port);
return -1;
@@
-977,6
+976,7
@@
cp
if(setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)))
{
if(setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)))
{
+ close(nfd);
syslog(LOG_ERR, _("System call `%s' failed: %m"),
"setsockopt");
return -1;
syslog(LOG_ERR, _("System call `%s' failed: %m"),
"setsockopt");
return -1;
@@
-985,6
+985,7
@@
cp
flags = fcntl(nfd, F_GETFL);
if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0)
{
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;
syslog(LOG_ERR, _("System call `%s' failed: %m"),
"fcntl");
return -1;
@@
-997,6
+998,7
@@
cp
if(bind(nfd, (struct sockaddr *)&a, sizeof(struct sockaddr)))
{
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;
}
syslog(LOG_ERR, _("Can't bind to port %hd/udp: %m"), myself->port);
return -1;
}
@@
-1007,6
+1009,7
@@
cp
if(connect(nfd, (struct sockaddr *)&a, sizeof(a)) == -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;
syslog(LOG_ERR, _("Connecting to %s port %d failed: %m"),
cl->hostname, cl->port);
return -1;
@@
-1015,6
+1018,7
@@
cp
flags = fcntl(nfd, F_GETFL);
if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0)
{
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;
syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m %s (%s)"), __FILE__, __LINE__, nfd,
cl->name, cl->hostname);
return -1;