svn commit: trunk/busybox/networking: udhcp

[aldot at busybox.net]

Author: aldot
Date: 2006-12-19 08:31:09 -0800 (Tue, 19 Dec 2006)
New Revision: 17006

Log:
- use xlisten/xsocket some more. Saves .25 kB


Modified:
   trunk/busybox/networking/dnsd.c
   trunk/busybox/networking/udhcp/clientsocket.c
   trunk/busybox/networking/udhcp/dhcpc.c
   trunk/busybox/networking/udhcp/dhcpd.c
   trunk/busybox/networking/udhcp/dhcprelay.c
   trunk/busybox/networking/udhcp/socket.c


Changeset:
Modified: trunk/busybox/networking/dnsd.c
===================================================================
--- trunk/busybox/networking/dnsd.c	2006-12-19 13:24:27 UTC (rev 17005)
+++ trunk/busybox/networking/dnsd.c	2006-12-19 16:31:09 UTC (rev 17006)
@@ -199,21 +199,21 @@
 {
 	struct sockaddr_in a;
 	char msg[100];
-	int s;
-	s = xsocket(PF_INET, SOCK_DGRAM, 0);
-	if (setsockopt_reuseaddr(s) < 0)
+	int sck;
+	sck = xsocket(PF_INET, SOCK_DGRAM, 0);
+	if (setsockopt_reuseaddr(sck) < 0)
 		bb_perror_msg_and_die("setsockopt() failed");
 	memset(&a, 0, sizeof(a));
 	a.sin_port = htons(listen_port);
 	a.sin_family = AF_INET;
 	if (!inet_aton(iface_addr, &a.sin_addr))
 		bb_perror_msg_and_die("bad iface address");
-	xbind(s, (struct sockaddr *)&a, sizeof(a));
-	xlisten(s, 50);
+	xbind(sck, (struct sockaddr *)&a, sizeof(a));
+	xlisten(sck, 50);
 	sprintf(msg, "accepting UDP packets on addr:port %s:%d\n",
 		iface_addr, (int)listen_port);
 	log_message(LOG_FILE, msg);
-	return s;
+	return sck;
 }
 
 /*
@@ -412,8 +412,6 @@
 #endif
 
 	udps = listen_socket(listen_interface, port);
-	if (udps < 0)
-		exit(1);
 
 	while (1) {
 		fd_set fdset;

Modified: trunk/busybox/networking/udhcp/clientsocket.c
===================================================================
--- trunk/busybox/networking/udhcp/clientsocket.c	2006-12-19 13:24:27 UTC (rev 17005)
+++ trunk/busybox/networking/udhcp/clientsocket.c	2006-12-19 16:31:09 UTC (rev 17006)
@@ -40,20 +40,12 @@
 	struct sockaddr_ll sock;
 
 	DEBUG("Opening raw socket on ifindex %d", ifindex);
-	fd = socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP));
-	if (fd < 0) {
-		bb_perror_msg("socket");
-		return -1;
-	}
+	fd = xsocket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP));
 
 	sock.sll_family = AF_PACKET;
 	sock.sll_protocol = htons(ETH_P_IP);
 	sock.sll_ifindex = ifindex;
-	if (bind(fd, (struct sockaddr *) &sock, sizeof(sock)) < 0) {
-		bb_perror_msg("bind");
-		close(fd);
-		return -1;
-	}
+	xbind(fd, (struct sockaddr *) &sock, sizeof(sock));
 
 	return fd;
 }

Modified: trunk/busybox/networking/udhcp/dhcpc.c
===================================================================
--- trunk/busybox/networking/udhcp/dhcpc.c	2006-12-19 13:24:27 UTC (rev 17005)
+++ trunk/busybox/networking/udhcp/dhcpc.c	2006-12-19 16:31:09 UTC (rev 17006)
@@ -278,10 +278,6 @@
 				fd = listen_socket(INADDR_ANY, CLIENT_PORT, client_config.interface);
 			else
 				fd = raw_socket(client_config.ifindex);
-			if (fd < 0) {
-				bb_perror_msg("FATAL: cannot listen on socket");
-				return 0;
-			}
 		}
 		max_fd = udhcp_sp_fd_set(&rfds, fd);
 

Modified: trunk/busybox/networking/udhcp/dhcpd.c
===================================================================
--- trunk/busybox/networking/udhcp/dhcpd.c	2006-12-19 13:24:27 UTC (rev 17005)
+++ trunk/busybox/networking/udhcp/dhcpd.c	2006-12-19 16:31:09 UTC (rev 17006)
@@ -70,10 +70,6 @@
 
 		if (server_socket < 0) {
 			server_socket = listen_socket(INADDR_ANY, SERVER_PORT, server_config.interface);
-			if (server_socket < 0) {
-				bb_perror_msg("FATAL: cannot create server socket");
-				return 2;
-			}
 		}
 
 		max_sock = udhcp_sp_fd_set(&rfds, server_socket);

Modified: trunk/busybox/networking/udhcp/dhcprelay.c
===================================================================
--- trunk/busybox/networking/udhcp/dhcprelay.c	2006-12-19 13:24:27 UTC (rev 17005)
+++ trunk/busybox/networking/udhcp/dhcprelay.c	2006-12-19 16:31:09 UTC (rev 17006)
@@ -169,7 +169,6 @@
 
 	/* talk to real server on bootps */
 	fds[0] = listen_socket(htonl(INADDR_ANY), 67, server);
-	if (fds[0] < 0) return -1;
 	*max_socket = fds[0];
 
 	/* array starts at 1 since server is 0 */
@@ -178,7 +177,6 @@
 	for (i=1; i < num_clients; i++) {
 		/* listen for clients on bootps */
 		fds[i] = listen_socket(htonl(INADDR_ANY), 67, client[i-1]);
-		if (fds[i] < 0) return -1;
 		if (fds[i] > *max_socket) *max_socket = fds[i];
 	}
 
@@ -321,8 +319,6 @@
 	signal(SIGINT, dhcprelay_signal_handler);
 
 	num_sockets = init_sockets(clients, num_sockets, argv[2], fds, &max_socket);
-	if (num_sockets == -1)
-		bb_perror_msg_and_die("init_sockets() failed");
 
 	if (read_interface(argv[2], NULL, &gw_ip, NULL) == -1)
 		return 1;

Modified: trunk/busybox/networking/udhcp/socket.c
===================================================================
--- trunk/busybox/networking/udhcp/socket.c	2006-12-19 13:24:27 UTC (rev 17005)
+++ trunk/busybox/networking/udhcp/socket.c	2006-12-19 16:31:09 UTC (rev 17006)
@@ -95,11 +95,7 @@
 	struct sockaddr_in addr;
 
 	DEBUG("Opening listen socket on 0x%08x:%d %s", ip, port, inf);
-	fd = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
-	if (fd < 0) {
-		bb_perror_msg("socket");
-		return -1;
-	}
+	fd = xsocket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
 
 	memset(&addr, 0, sizeof(addr));
 	addr.sin_family = AF_INET;