Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-07-04 21:29:34 +00:00
Code Issues Projects Releases Wiki Activity

zcip: use xfunc() where appropriate

Browse Source
This commit is contained in:
Denis Vlasenko 2006-09-03 12:23:56 +00:00
parent 27af5a0dd3
commit 035aae5841
1 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
networking/zcip.c
View File

@ -132,6 +132,7 @@ static int arp(int fd, struct sockaddr *saddr, int op,
/** /**
* Run a script. * Run a script.
* TODO: sort out stderr/syslog reporting.
*/ */
static int run(char *script, char *arg, char *intf, struct in_addr *ip) static int run(char *script, char *arg, char *intf, struct in_addr *ip)
{ {
@ -207,6 +208,9 @@ int zcip_main(int argc, char *argv[])
int t; int t;
int state = PROBE; int state = PROBE;
struct ifreq ifr;
unsigned short seed[3];
// parse commandline: prog [options] ifname script // parse commandline: prog [options] ifname script
while ((t = getopt(argc, argv, "fqr:v")) != EOF) { while ((t = getopt(argc, argv, "fqr:v")) != EOF) {
switch (t) { switch (t) {
@ -249,38 +253,28 @@ int zcip_main(int argc, char *argv[])
safe_strncpy(saddr.sa_data, intf, sizeof (saddr.sa_data)); safe_strncpy(saddr.sa_data, intf, sizeof (saddr.sa_data));
// open an ARP socket // open an ARP socket
if ((fd = socket(PF_PACKET, SOCK_PACKET, htons(ETH_P_ARP))) < 0) { fd = xsocket(PF_PACKET, SOCK_PACKET, htons(ETH_P_ARP));
why = "open"; // bind to the interface's ARP socket
fail: xbind(fd, &saddr, sizeof (saddr);
// get the interface's ethernet address
memset(&ifr, 0, sizeof (ifr));
strncpy(ifr.ifr_name, intf, sizeof (ifr.ifr_name));
if (ioctl(fd, SIOCGIFHWADDR, &ifr) < 0) {
foreground = 1; foreground = 1;
why = "get ethernet address";
goto bad; goto bad;
} }
// bind to the interface's ARP socket memcpy(&addr, &ifr.ifr_hwaddr.sa_data, ETH_ALEN);
if (bind(fd, &saddr, sizeof (saddr)) < 0) {
why = "bind";
goto fail;
} else {
struct ifreq ifr;
unsigned short seed[3];
// get the interface's ethernet address // start with some stable ip address, either a function of
memset(&ifr, 0, sizeof (ifr)); // the hardware address or else the last address we used.
strncpy(ifr.ifr_name, intf, sizeof (ifr.ifr_name)); // NOTE: the sequence of addresses we try changes only
if (ioctl(fd, SIOCGIFHWADDR, &ifr) < 0) { // depending on when we detect conflicts.
why = "get ethernet address"; memcpy(seed, &ifr.ifr_hwaddr.sa_data, ETH_ALEN);
goto fail; seed48(seed);
} if (ip.s_addr == 0)
memcpy(&addr, &ifr.ifr_hwaddr.sa_data, ETH_ALEN); pick(&ip);
// start with some stable ip address, either a function of
// the hardware address or else the last address we used.
// NOTE: the sequence of addresses we try changes only
// depending on when we detect conflicts.
memcpy(seed, &ifr.ifr_hwaddr.sa_data, ETH_ALEN);
seed48(seed);
if (ip.s_addr == 0)
pick(&ip);
}
// FIXME cases to handle: // FIXME cases to handle:
// - zcip already running! // - zcip already running!