diff options
| author | Simon Rettberg | 2019-02-18 11:55:41 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2019-02-18 11:55:41 +0100 |
| commit | ae69a754244c4e475c8d2591772ca8e005071d83 (patch) | |
| tree | 58b3fa7abc2dcfe3c23e1c0ce108950c720826ab /hacks/glx/sonar-icmp.c | |
| parent | Update gitignore (diff) | |
| download | xscreensaver-ae69a754244c4e475c8d2591772ca8e005071d83.tar.gz xscreensaver-ae69a754244c4e475c8d2591772ca8e005071d83.tar.xz xscreensaver-ae69a754244c4e475c8d2591772ca8e005071d83.zip | |
Update to 5.42
Diffstat (limited to 'hacks/glx/sonar-icmp.c')
| -rw-r--r-- | hacks/glx/sonar-icmp.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/hacks/glx/sonar-icmp.c b/hacks/glx/sonar-icmp.c index 3464c37..862f358 100644 --- a/hacks/glx/sonar-icmp.c +++ b/hacks/glx/sonar-icmp.c @@ -758,7 +758,9 @@ subnet_hosts (sonar_sensor_data *ssd, char **error_ret, char **desc_ret, mask_width (mask), mask); if (in2.s_addr == 0x0100007f || /* 127.0.0.1 in network order */ + ((in2.s_addr & 0x000000ff) == 0x7f) || /* 127.0.0.0/24 */ mask == 0) + /* Assume all 127 addresses are loopback, not just 127.0.0.1. */ continue; /* At least on the AT&T 3G network, pinging either of the two @@ -780,6 +782,10 @@ subnet_hosts (sonar_sensor_data *ssd, char **error_ret, char **desc_ret, in = in2; subnet_width = mask_width (mask); + + /* Take the first non-loopback network: prefer en0 over en1. */ + if (in.s_addr && subnet_width) + break; } if (in.s_addr) @@ -980,6 +986,8 @@ send_ping (ping_data *pd, const sonar_bogie *b) perror(buf); #endif } + + free (packet); } /* signal handler */ |