diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2013-07-12 20:54:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-07-12 20:54:41 +0000 |
| commit | 843c7616a2f52b7c4b93445835130cc8be37774c (patch) | |
| tree | fb620556bbf1b26b804eb3d57af7e702f7c39358 | |
| parent | 67d70dd91e6a3b7de77e4e11a38e811cbc1edc1f (diff) | |
| parent | eadaaeadfa3d5fcf49f433896e9244f0a10a5f63 (diff) | |
| download | iputils-843c7616a2f52b7c4b93445835130cc8be37774c.tar.gz | |
Merge "Reduce spurious diffs with upstream."
| -rw-r--r-- | ping.c | 2 | ||||
| -rw-r--r-- | ping_common.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -75,7 +75,6 @@ struct icmp_filter { #ifdef ANDROID #include <sys/auxv.h> -#define bcmp(a, b, c) memcmp(a, b, c) #endif #define MAXIPLEN 60 @@ -120,6 +119,7 @@ struct sockaddr_in source; char *device; int pmtudisc = -1; + int main(int argc, char **argv) { diff --git a/ping_common.c b/ping_common.c index 2bdd6f9..0342e1a 100644 --- a/ping_common.c +++ b/ping_common.c @@ -630,6 +630,7 @@ void setup(int icmp_sock) fprintf(stderr, "Warning: no SO_TIMESTAMP support, falling back to SIOCGSTAMP\n"); } #endif +#ifdef SO_MARK if (options & F_MARK) { int ret; @@ -644,6 +645,7 @@ void setup(int icmp_sock) fprintf(stderr, "Warning: Failed to set mark %d\n", mark); } } +#endif /* Set some SNDTIMEO to prevent blocking forever * on sends, when device is too slow or stalls. Just put limit |