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

zcip: tweak comments and make unsigned division more obvious

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2015-08-04 15:06:38 +02:00
parent e347583835
commit a83e3ae172
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
networking/zcip.c
View File

@ -56,9 +56,6 @@ struct arp_packet {
} PACKED; } PACKED;
enum { enum {
/* 169.254.0.0 */
LINKLOCAL_ADDR = 0xa9fe0000,
/* 0-1 seconds before sending 1st probe */ /* 0-1 seconds before sending 1st probe */
PROBE_WAIT = 1, PROBE_WAIT = 1,
/* 1-2 seconds between probes */ /* 1-2 seconds between probes */
@ -70,7 +67,7 @@ enum {
/* if probe/announce sees a conflict, multiply RANDOM(NUM_CONFLICT) by... */ /* if probe/announce sees a conflict, multiply RANDOM(NUM_CONFLICT) by... */
CONFLICT_MULTIPLIER = 2, CONFLICT_MULTIPLIER = 2,
/* if we monitor and see a conflict, how long is defend state? */ /* if we monitor and see a conflict, how long is defend state? */
DEFEND_INTERVAL = 10 DEFEND_INTERVAL = 10,
}; };
/* States during the configuration process. */ /* States during the configuration process. */
@ -196,7 +193,7 @@ static int run(char *argv[3], const char *param, uint32_t nip)
*/ */
static ALWAYS_INLINE unsigned random_delay_ms(unsigned secs) static ALWAYS_INLINE unsigned random_delay_ms(unsigned secs)
{ {
return rand() % (secs * 1000); return (unsigned)rand() % (secs * 1000);
} }
/** /**
@ -328,9 +325,9 @@ int zcip_main(int argc UNUSED_PARAM, char **argv)
// - start with some address we want to try // - start with some address we want to try
// - short random delay // - short random delay
// - arp probes to see if another host uses it // - arp probes to see if another host uses it
// 00:04:e2:64:23:c2 > ff:ff:ff:ff:ff:ff: arp who-has 169.254.194.171 tell 0.0.0.0 // 00:04:e2:64:23:c2 > ff:ff:ff:ff:ff:ff arp who-has 169.254.194.171 tell 0.0.0.0
// - arp announcements that we're claiming it // - arp announcements that we're claiming it
// 00:04:e2:64:23:c2 > ff:ff:ff:ff:ff:ff: arp who-has 169.254.194.171 (00:04:e2:64:23:c2) tell 169.254.194.171 // 00:04:e2:64:23:c2 > ff:ff:ff:ff:ff:ff arp who-has 169.254.194.171 (00:04:e2:64:23:c2) tell 169.254.194.171
// - use it // - use it
// - defend it, within limits // - defend it, within limits
// exit if: // exit if:
@ -412,7 +409,7 @@ int zcip_main(int argc UNUSED_PARAM, char **argv)
// NOTE: all other exit paths should deconfig... // NOTE: all other exit paths should deconfig...
if (QUIT) if (QUIT)
return EXIT_SUCCESS; return EXIT_SUCCESS;
// fall through: switch_to_MONITOR // fall through: switch to MONITOR
default: default:
// case DEFEND: // case DEFEND:
// case MONITOR: (shouldn't happen, MONITOR timeout is infinite) // case MONITOR: (shouldn't happen, MONITOR timeout is infinite)
@ -520,7 +517,7 @@ int zcip_main(int argc UNUSED_PARAM, char **argv)
} }
// Note: if we only have a target IP conflict here (ip_conflict & 2), // Note: if we only have a target IP conflict here (ip_conflict & 2),
// IOW: if we just saw this sort of ARP packet: // IOW: if we just saw this sort of ARP packet:
// aa:bb:cc:dd:ee:ff > xx:xx:xx:xx:xx:xx: arp who-has <chosen_nip> tell 0.0.0.0 // aa:bb:cc:dd:ee:ff > xx:xx:xx:xx:xx:xx arp who-has <chosen_nip> tell 0.0.0.0
// we expect _kernel_ to respond to that, because <chosen_nip> // we expect _kernel_ to respond to that, because <chosen_nip>
// is (expected to be) configured on this iface. // is (expected to be) configured on this iface.
} // while (1) } // while (1)