wget: -O FILE is allowed to overwrite existing file (compat)

[oweals/busybox.git] / networking / netstat.c

diff --git a/networking/netstat.c b/networking/netstat.c
index 5fb5c386f52e9eb05d01bb2fd54d37cbedf97f01..5bacb47cc09f16732a72c5e4dbcc0f22db56605f 100644 (file)
--- a/networking/netstat.c
+++ b/networking/netstat.c
@@ -11,7 +11,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include "busybox.h"
+#include "libbb.h"
 #include "inet_common.h"
 
 enum {
@@ -47,8 +47,7 @@ enum {
        TCP_CLOSING /* now a valid state */
 };
 
-static const char * const tcp_state[] =
-{
+static const char *const tcp_state[] = {
        "",
        "ESTABLISHED",
        "SYN_SENT",
@@ -98,13 +97,13 @@ static void build_ipv6_addr(char* local_addr, struct sockaddr_in6* localaddr)
 {
        char addr6[INET6_ADDRSTRLEN];
        struct in6_addr in6;
-               
+
        sscanf(local_addr, "%08X%08X%08X%08X",
                   &in6.s6_addr32[0], &in6.s6_addr32[1],
                   &in6.s6_addr32[2], &in6.s6_addr32[3]);
        inet_ntop(AF_INET6, &in6, addr6, sizeof(addr6));
        inet_pton(AF_INET6, addr6, (struct sockaddr *) &localaddr->sin6_addr);
-               
+
        localaddr->sin6_family = AF_INET6;
 }
 #endif
@@ -120,50 +119,33 @@ static void build_ipv4_addr(char* local_addr, struct sockaddr_in* localaddr)
        ((struct sockaddr *) localaddr)->sa_family = AF_INET;
 }
 
-static const char *get_sname(int port, const char *proto, int num)
+static const char *get_sname(int port, const char *proto, int numeric)
 {
-       /* hummm, we return static buffer here!! */
-       const char *str = itoa(ntohs(port));
-       if (!num) {
+       if (!port)
+               return "*";
+       if (!numeric) {
                struct servent *se = getservbyport(port, proto);
                if (se)
-                       str = se->s_name;
+                       return se->s_name;
        }
-       if (!port) {
-               str = "*";
-       }
-       return str;
+       /* hummm, we may return static buffer here!! */
+       return itoa(ntohs(port));
 }
 
-static void snprint_ip_port(char *ip_port, int size, struct sockaddr *addr, int port, const char *proto, int numeric)
+static char *ip_port_str(struct sockaddr *addr, int port, const char *proto, int numeric)
 {
-       const char *port_name;
-       int max_len;
-       int port_name_len;
+       enum { salen = USE_FEATURE_IPV6(sizeof(struct sockaddr_in6)) SKIP_FEATURE_IPV6(sizeof(struct sockaddr_in)) };
+       char *host, *host_port;
 
-// TODO: replace by xmalloc_sockaddr2host?
-#if ENABLE_FEATURE_IPV6
-       if (addr->sa_family == AF_INET6) {
-               INET6_rresolve(ip_port, size, (struct sockaddr_in6 *)addr,
-                       (numeric & NETSTAT_NUMERIC) ? 0x0fff : 0);
-       } else
-#endif
-       {
-               INET_rresolve(ip_port, size, (struct sockaddr_in *)addr,
-                       0x4000 | ((numeric & NETSTAT_NUMERIC) ? 0x0fff : 0),
-                       0xffffffff);
-       }
-       port_name = get_sname(htons(port), proto, numeric);
-       
-       max_len = (option_mask32 & OPT_widedisplay)
-                       ? (PRINT_IP_MAX_SIZE_WIDE - 1)
-                       : (PRINT_IP_MAX_SIZE - 1);
-       port_name_len = strlen(port_name);
-       if ((strlen(ip_port) + port_name_len) > max_len)
-               ip_port[max_len - port_name_len] = '\0';
-       ip_port += strlen(ip_port);
-       *ip_port++ = ':';
-       strcpy(ip_port, port_name);
+       /* Code which used "*" for INADDR_ANY is removed: it's ambiguous in IPv6,
+        * while "0.0.0.0" is not. */
+
+       host = numeric ? xmalloc_sockaddr2dotted_noport(addr)
+                      : xmalloc_sockaddr2host_noport(addr);
+
+       host_port = xasprintf("%s:%s", host, get_sname(htons(port), proto, numeric));
+       free(host);
+       return host_port;
 }
 
 static void tcp_do_one(int lnr, const char *line)
@@ -206,14 +188,16 @@ static void tcp_do_one(int lnr, const char *line)
        if ((rem_port && (flags & NETSTAT_CONNECTED))
         || (!rem_port && (flags & NETSTAT_LISTENING))
        ) {
-               snprint_ip_port(local_addr, sizeof(local_addr),
+               char *l = ip_port_str(
                                (struct sockaddr *) &localaddr, local_port,
                                "tcp", flags & NETSTAT_NUMERIC);
-               snprint_ip_port(rem_addr, sizeof(rem_addr),
+               char *r = ip_port_str(
                                (struct sockaddr *) &remaddr, rem_port,
                                "tcp", flags & NETSTAT_NUMERIC);
                printf(net_conn_line,
-                       "tcp", rxq, txq, local_addr, rem_addr, tcp_state[state]);
+                       "tcp", rxq, txq, l, r, tcp_state[state]);
+               free(l);
+               free(r);
        }
 }
 
@@ -285,14 +269,16 @@ static void udp_do_one(int lnr, const char *line)
                if ((have_remaddr && (flags & NETSTAT_CONNECTED))
                 || (!have_remaddr && (flags & NETSTAT_LISTENING))
                ) {
-                       snprint_ip_port(local_addr, sizeof(local_addr),
+                       char *l = ip_port_str(
                                (struct sockaddr *) &localaddr, local_port,
                                "udp", flags & NETSTAT_NUMERIC);
-                       snprint_ip_port(rem_addr, sizeof(rem_addr),
+                       char *r = ip_port_str(
                                (struct sockaddr *) &remaddr, rem_port,
                                "udp", flags & NETSTAT_NUMERIC);
                        printf(net_conn_line,
-                               "udp", rxq, txq, local_addr, rem_addr, state_str);      
+                               "udp", rxq, txq, l, r, state_str);
+                       free(l);
+                       free(r);
                }
        }
 }
@@ -339,14 +325,16 @@ static void raw_do_one(int lnr, const char *line)
                if ((have_remaddr && (flags & NETSTAT_CONNECTED))
                 || (!have_remaddr && (flags & NETSTAT_LISTENING))
                ) {
-                       snprint_ip_port(local_addr, sizeof(local_addr),
+                       char *l = ip_port_str(
                                (struct sockaddr *) &localaddr, local_port,
                                "raw", flags & NETSTAT_NUMERIC);
-                       snprint_ip_port(rem_addr, sizeof(rem_addr),
+                       char *r = ip_port_str(
                                (struct sockaddr *) &remaddr, rem_port,
                                "raw", flags & NETSTAT_NUMERIC);
                        printf(net_conn_line,
-                               "raw", rxq, txq, local_addr, rem_addr, itoa(state));
+                               "raw", rxq, txq, l, r, itoa(state));
+                       free(l);
+                       free(r);
                }
        }
 }
@@ -509,7 +497,7 @@ int netstat_main(int argc, char **argv)
 #endif
 
        /* Option string must match NETSTAT_xxx constants */
-       opt = getopt32(argc, argv, NETSTAT_OPTS);
+       opt = getopt32(argv, NETSTAT_OPTS);
        if (opt & 0x1) { // -l
                flags &= ~NETSTAT_CONNECTED;
                flags |= NETSTAT_LISTENING;