aboutsummaryrefslogtreecommitdiff
path: root/networking
diff options
context:
space:
mode:
Diffstat (limited to 'networking')
-rw-r--r--networking/libiproute/ipaddress.c6
-rw-r--r--networking/telnet.c4
-rw-r--r--networking/traceroute.c2
3 files changed, 11 insertions, 1 deletions
diff --git a/networking/libiproute/ipaddress.c b/networking/libiproute/ipaddress.c
index 71e8fb6a7..91fabb1fd 100644
--- a/networking/libiproute/ipaddress.c
+++ b/networking/libiproute/ipaddress.c
@@ -21,6 +21,12 @@
21#define IFF_LOWER_UP 0x10000 /* driver signals L1 up */ 21#define IFF_LOWER_UP 0x10000 /* driver signals L1 up */
22#endif 22#endif
23 23
24#ifndef IFA_F_NOPREFIXROUTE
25# define IFA_FLAGS 8
26/* ifa_flags */
27# define IFA_F_NOPREFIXROUTE 0x200
28#endif
29
24struct filter_t { 30struct filter_t {
25 char *label; 31 char *label;
26 /* Flush cmd buf. If !NULL, print_addrinfo() constructs flush commands in it */ 32 /* Flush cmd buf. If !NULL, print_addrinfo() constructs flush commands in it */
diff --git a/networking/telnet.c b/networking/telnet.c
index 19a414b30..7a0253525 100644
--- a/networking/telnet.c
+++ b/networking/telnet.c
@@ -368,12 +368,16 @@ static void put_iac2_msb_lsb(unsigned x_y)
368} 368}
369#define put_iac2_x_y(x,y) put_iac2_msb_lsb(((x)<<8) + (y)) 369#define put_iac2_x_y(x,y) put_iac2_msb_lsb(((x)<<8) + (y))
370 370
371#if ENABLE_FEATURE_TELNET_WIDTH \
372 || ENABLE_FEATURE_TELNET_TTYPE \
373 || ENABLE_FEATURE_TELNET_AUTOLOGIN
371static void put_iac4_msb_lsb(unsigned x_y_z_t) 374static void put_iac4_msb_lsb(unsigned x_y_z_t)
372{ 375{
373 put_iac2_msb_lsb(x_y_z_t >> 16); 376 put_iac2_msb_lsb(x_y_z_t >> 16);
374 put_iac2_msb_lsb(x_y_z_t); /* "... & 0xffff" is implicit */ 377 put_iac2_msb_lsb(x_y_z_t); /* "... & 0xffff" is implicit */
375} 378}
376#define put_iac4_x_y_z_t(x,y,z,t) put_iac4_msb_lsb(((x)<<24) + ((y)<<16) + ((z)<<8) + (t)) 379#define put_iac4_x_y_z_t(x,y,z,t) put_iac4_msb_lsb(((x)<<24) + ((y)<<16) + ((z)<<8) + (t))
380#endif
377 381
378static void put_iac3_IAC_x_y_merged(unsigned wwdd_and_c) 382static void put_iac3_IAC_x_y_merged(unsigned wwdd_and_c)
379{ 383{
diff --git a/networking/traceroute.c b/networking/traceroute.c
index ec3ac8b6f..3f1a9ab46 100644
--- a/networking/traceroute.c
+++ b/networking/traceroute.c
@@ -483,7 +483,7 @@ wait_for_reply(unsigned *timestamp_us, int *left_ms)
483 &G.from_lsa->u.sa, &G.from_lsa->len); 483 &G.from_lsa->u.sa, &G.from_lsa->len);
484#endif 484#endif
485 if (read_len < 0) 485 if (read_len < 0)
486 bb_perror_msg_and_die("recv"); 486 bb_simple_perror_msg_and_die("recv");
487 t = monotonic_us(); 487 t = monotonic_us();
488 *left_ms -= (t - *timestamp_us) / 1000; 488 *left_ms -= (t - *timestamp_us) / 1000;
489 *timestamp_us = t; 489 *timestamp_us = t;