[PATCH] very minor shrinkage in some of networking/*
Bernhard Fischer
rep.nop at aon.at
Mon Dec 18 15:35:00 UTC 2006
Hi,
I have this patch lying around. Looks like it would strip off a byte or
two.
Does it? :)
Please apply if you like it or let me know if i should check it in.
TIA and cheers,
Bernhard
-------------- next part --------------
Index: busybox/networking/dnsd.c
===================================================================
--- busybox/networking/dnsd.c (revision 16681)
+++ busybox/networking/dnsd.c (working copy)
@@ -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;
Index: busybox/networking/udhcp/dhcprelay.c
===================================================================
--- busybox/networking/udhcp/dhcprelay.c (revision 16681)
+++ busybox/networking/udhcp/dhcprelay.c (working copy)
@@ -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;
Index: busybox/networking/udhcp/dhcpc.c
===================================================================
--- busybox/networking/udhcp/dhcpc.c (revision 16681)
+++ busybox/networking/udhcp/dhcpc.c (working copy)
@@ -304,10 +304,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);
Index: busybox/networking/udhcp/dhcpd.c
===================================================================
--- busybox/networking/udhcp/dhcpd.c (revision 16681)
+++ busybox/networking/udhcp/dhcpd.c (working copy)
@@ -69,10 +69,8 @@
while (1) { /* loop until universe collapses */
if (server_socket < 0)
- if ((server_socket = listen_socket(INADDR_ANY, SERVER_PORT, server_config.interface)) < 0) {
- bb_perror_msg("FATAL: cannot create server socket");
- return 2;
- }
+ server_socket = listen_socket(INADDR_ANY, SERVER_PORT,
+ server_config.interface);
max_sock = udhcp_sp_fd_set(&rfds, server_socket);
if (server_config.auto_time) {
Index: busybox/networking/udhcp/clientsocket.c
===================================================================
--- busybox/networking/udhcp/clientsocket.c (revision 16681)
+++ busybox/networking/udhcp/clientsocket.c (working copy)
@@ -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;
}
Index: busybox/networking/udhcp/socket.c
===================================================================
--- busybox/networking/udhcp/socket.c (revision 16681)
+++ busybox/networking/udhcp/socket.c (working copy)
@@ -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;
More information about the busybox
mailing list