X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet_socket.c;h=98f5d1a2cf9e65419e9dbcd3a419cf4299c9abc8;hp=90458d2816aebb575815c104112613161cfddd7e;hb=eefa28059ab989c915a7d95fb4ae728abd7ce713;hpb=00ddbf5723511d80fbd2522fc503bd409dc6189a

diff --git a/src/net_socket.c b/src/net_socket.c
index 90458d28..98f5d1a2 100644
--- a/src/net_socket.c
+++ b/src/net_socket.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.
 
-    $Id: net_socket.c,v 1.1.2.28 2003/07/18 13:41:35 guus Exp $
+    $Id: net_socket.c,v 1.1.2.30 2003/07/22 20:55:20 guus Exp $
 */
 
 #include "system.h"
@@ -48,7 +48,7 @@ int setup_listen_socket(sockaddr_t *sa)
 	int nfd, flags;
 	char *addrstr;
 	int option;
-	char *interface;
+	char *iface;
 	struct ifreq ifr;
 
 	cp();
@@ -84,14 +84,14 @@ int setup_listen_socket(sockaddr_t *sa)
 #endif
 
 	if(get_config_string
-	   (lookup_config(config_tree, "BindToInterface"), &interface)) {
+	   (lookup_config(config_tree, "BindToInterface"), &iface)) {
 #if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE)
 		memset(&ifr, 0, sizeof(ifr));
-		strncpy(ifr.ifr_ifrn.ifrn_name, interface, IFNAMSIZ);
+		strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ);
 
 		if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr))) {
 			close(nfd);
-			logger(LOG_ERR, _("Can't bind to interface %s: %s"), interface,
+			logger(LOG_ERR, _("Can't bind to interface %s: %s"), iface,
 				   strerror(errno));
 			return -1;
 		}
@@ -125,7 +125,7 @@ int setup_vpn_in_socket(sockaddr_t *sa)
 	char *addrstr;
 	int option;
 #if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE)
-	char *interface;
+	char *iface;
 	struct ifreq ifr;
 #endif
 
@@ -151,13 +151,13 @@ int setup_vpn_in_socket(sockaddr_t *sa)
 
 #if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE)
 	if(get_config_string
-	   (lookup_config(config_tree, "BindToInterface"), &interface)) {
+	   (lookup_config(config_tree, "BindToInterface"), &iface)) {
 		memset(&ifr, 0, sizeof(ifr));
-		strncpy(ifr.ifr_ifrn.ifrn_name, interface, IFNAMSIZ);
+		strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ);
 
 		if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr))) {
 			close(nfd);
-			logger(LOG_ERR, _("Can't bind to interface %s: %s"), interface,
+			logger(LOG_ERR, _("Can't bind to interface %s: %s"), iface,
 				   strerror(errno));
 			return -1;
 		}
@@ -221,7 +221,7 @@ begin:
 		if(!c->outgoing->cfg) {
 			ifdebug(CONNECTIONS) logger(LOG_ERR, _("Could not set up a meta connection to %s"),
 					   c->name);
-			c->status.remove = 1;
+			c->status.remove = true;
 			retry_outgoing(c->outgoing);
 			return;
 		}
@@ -292,7 +292,7 @@ begin:
 
 	if(result == -1) {
 		if(errno == EINPROGRESS) {
-			c->status.connecting = 1;
+			c->status.connecting = true;
 			return;
 		}
 
@@ -357,7 +357,7 @@ void setup_outgoing_connection(outgoing_t *outgoing)
   accept a new tcp connect and create a
   new connection
 */
-int handle_new_meta_connection(int sock)
+bool handle_new_meta_connection(int sock)
 {
 	connection_t *c;
 	sockaddr_t sa;
@@ -370,7 +370,7 @@ int handle_new_meta_connection(int sock)
 	if(fd < 0) {
 		logger(LOG_ERR, _("Accepting a new connection failed: %s"),
 			   strerror(errno));
-		return -1;
+		return false;
 	}
 
 	sockaddrunmap(&sa);
@@ -393,7 +393,7 @@ int handle_new_meta_connection(int sock)
 	c->allow_request = ID;
 	send_id(c);
 
-	return 0;
+	return true;
 }
 
 void try_outgoing_connections(void)
@@ -408,7 +408,7 @@ void try_outgoing_connections(void)
 		cfg = lookup_config_next(config_tree, cfg)) {
 		get_config_string(cfg, &name);
 
-		if(check_id(name)) {
+		if(!check_id(name)) {
 			logger(LOG_ERR,
 				   _("Invalid name for outgoing connection in %s line %d"),
 				   cfg->file, cfg->line);