network_cmds-543.50.4.tar.gz

diff --git a/ifconfig.tproj/ifconfig.c b/ifconfig.tproj/ifconfig.c
index 33af6fbe20e7d3a551d08b1cf1b820a672dfc475..d609ae841207d312d93ff6d0cecc5fa52e966186 100644 (file)
--- a/ifconfig.tproj/ifconfig.c
+++ b/ifconfig.tproj/ifconfig.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2009-2017 Apple Inc. All rights reserved.
+ * Copyright (c) 2009-2018 Apple Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  *
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  *


@@ -1047,6 +1047,16 @@ setecnmode(const char *val, int dummy __unused, int s,
                Perror("ioctl(SIOCSECNMODE)");
 }
 
                Perror("ioctl(SIOCSECNMODE)");
 }
 

+void
+setprobeconnectivity(const char *vname, int value, int s, const struct afswtch *afp)
+{
+       strlcpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
+       ifr.ifr_ifru.ifru_probe_connectivity = value;
+
+       if (ioctl(s, SIOCSIFPROBECONNECTIVITY, (caddr_t)&ifr) < 0)
+               Perror(vname);
+}
+

 #if defined(SIOCSQOSMARKINGMODE) && defined(SIOCSQOSMARKINGENABLED)
 
 void
 #if defined(SIOCSQOSMARKINGMODE) && defined(SIOCSQOSMARKINGENABLED)
 
 void


@@ -1185,7 +1195,7 @@ setqosmarking(const char *cmd, const char *arg, int s, const struct afswtch *afp
 "\20MULTICAST"
 
 #define        IFEFBITS \
 "\20MULTICAST"
 
 #define        IFEFBITS \

-"\020\1AUTOCONFIGURING\5FASTLN_CAP\6IPV6_DISABLED\7ACCEPT_RTADV\10TXSTART\11RXPOLL" \
+"\020\1AUTOCONFIGURING\4PROBE_CONNECTIVITY\5FASTLN_CAP\6IPV6_DISABLED\7ACCEPT_RTADV\10TXSTART\11RXPOLL" \

 "\12VLAN\13BOND\14ARPLL\15NOWINDOWSCALE\16NOAUTOIPV6LL\17EXPENSIVE\20ROUTER4" \
 "\21ROUTER6\22LOCALNET_PRIVATE\23ND6ALT\24RESTRICTED_RECV\25AWDL\26NOACKPRI" \
 "\27AWDL_RESTRICTED\30CL2K\31ECN_ENABLE\32ECN_DISABLE\33CHANNEL_DRV\34CA" \
 "\12VLAN\13BOND\14ARPLL\15NOWINDOWSCALE\16NOAUTOIPV6LL\17EXPENSIVE\20ROUTER4" \
 "\21ROUTER6\22LOCALNET_PRIVATE\23ND6ALT\24RESTRICTED_RECV\25AWDL\26NOACKPRI" \
 "\27AWDL_RESTRICTED\30CL2K\31ECN_ENABLE\32ECN_DISABLE\33CHANNEL_DRV\34CA" \


@@ -1918,6 +1928,8 @@ static struct cmd basic_cmds[] = {
        DEF_CMD_ARG2("fastlane",                setfastlane),
        DEF_CMD_ARG2("qosmarking",              setqosmarking),
        DEF_CMD_ARG("disable_output",           setdisableoutput),
        DEF_CMD_ARG2("fastlane",                setfastlane),
        DEF_CMD_ARG2("qosmarking",              setqosmarking),
        DEF_CMD_ARG("disable_output",           setdisableoutput),

+       DEF_CMD("probe_connectivity",   1,              setprobeconnectivity),
+       DEF_CMD("-probe_connectivity",  0,              setprobeconnectivity),

 };
 
 static __constructor void
 };
 
 static __constructor void

diff --git a/netstat.tproj/systm.c b/netstat.tproj/systm.c
index d94dec0c49b6e11c716d7df08f3b015156abca46..dbb228faa251376a67f57c3a68ff65225462614d 100644 (file)
--- a/netstat.tproj/systm.c
+++ b/netstat.tproj/systm.c
@@ -363,6 +363,10 @@ kctl_stats(uint32_t off __unused, char *name, int af __unused)
        p(kcs_send_list_fail, "\t%llu send list failure%s\n");
        p(kcs_enqueue_fail, "\t%llu enqueue failure%s\n");
        p(kcs_enqueue_fullsock, "\t%llu packet%s dropped due to full socket buffers\n");
        p(kcs_send_list_fail, "\t%llu send list failure%s\n");
        p(kcs_enqueue_fail, "\t%llu enqueue failure%s\n");
        p(kcs_enqueue_fullsock, "\t%llu packet%s dropped due to full socket buffers\n");

+       p(kcs_bad_kctlref, "\t%llu failure%s with bad kern_ctl_ref\n");
+       p(kcs_tbl_size_too_big, "\t%llu register failure%s because of too many kern_ctl_ref\n");
+       p(kcs_enqdata_mb_alloc_fail, "\t%llu enqueuedata failure%s because could not allocate a packet\n");
+       p(kcs_enqdata_sbappend_fail, "\t%llu enqueuedata failure%s due to full socket buffers\n");

        
 #undef STATDIFF
 #undef p
        
 #undef STATDIFF
 #undef p

diff --git a/pktmnglr/packet_mangler.c b/pktmnglr/packet_mangler.c
index 8ce0f8fc2875e1d32f30d92c9da1aed01ca4555f..8a5b0f1243ce6e8fc5d9430f66527288876b67df 100644 (file)
--- a/pktmnglr/packet_mangler.c
+++ b/pktmnglr/packet_mangler.c
@@ -72,7 +72,7 @@ static const char *
 basename(const char * str)
 {
     const char *last_slash = strrchr(str, '/');
 basename(const char * str)
 {
     const char *last_slash = strrchr(str, '/');

-    
+

     if (last_slash == NULL)
         return (str);
     else
     if (last_slash == NULL)
         return (str);
     else


@@ -106,45 +106,45 @@ usage(const char *cmd)
     struct option_desc *option_desc;
     char * usage_str = (char *)malloc(BUF_MAX);
     size_t usage_len;
     struct option_desc *option_desc;
     char * usage_str = (char *)malloc(BUF_MAX);
     size_t usage_len;

-    
+

     if (usage_str == NULL)
         err(1, "%s: malloc(%d)", __func__, BUF_MAX);
     if (usage_str == NULL)
         err(1, "%s: malloc(%d)", __func__, BUF_MAX);

-    
+

     usage_len = snprintf(usage_str, BUF_MAX, "# usage: %s ", basename(cmd));
     usage_len = snprintf(usage_str, BUF_MAX, "# usage: %s ", basename(cmd));

-    
+

     for (option_desc = option_desc_list; option_desc->option != NULL; option_desc++) {
         int len;
     for (option_desc = option_desc_list; option_desc->option != NULL; option_desc++) {
         int len;

-        
+

         if (option_desc->required)
             len = snprintf(usage_str + usage_len, BUF_MAX - usage_len, "%s ", option_desc->option);
         else
             len = snprintf(usage_str + usage_len, BUF_MAX - usage_len, "[%s] ", option_desc->option);
         if (len < 0)
             err(1, "%s: snprintf(", __func__);
         if (option_desc->required)
             len = snprintf(usage_str + usage_len, BUF_MAX - usage_len, "%s ", option_desc->option);
         else
             len = snprintf(usage_str + usage_len, BUF_MAX - usage_len, "[%s] ", option_desc->option);
         if (len < 0)
             err(1, "%s: snprintf(", __func__);

-        
+

         usage_len += len;
         if (usage_len > BUF_MAX)
             break;
     }
     printf("%s\n", usage_str);
     printf("options:\n");
         usage_len += len;
         if (usage_len > BUF_MAX)
             break;
     }
     printf("%s\n", usage_str);
     printf("options:\n");

-    
+

     for (option_desc = option_desc_list; option_desc->option != NULL; option_desc++) {
         printf(" %-20s # %s\n", option_desc->option, option_desc->description);
     }
     for (option_desc = option_desc_list; option_desc->option != NULL; option_desc++) {
         printf(" %-20s # %s\n", option_desc->option, option_desc->description);
     }

-    
+

 }
 
 int
 main(int argc, char * const argv[]) {
     int ch;
     int error;
 }
 
 int
 main(int argc, char * const argv[]) {
     int ch;
     int error;

-    
+

     if (argc == 1) {
         usage(argv[0]);
         exit(0);
     }
     if (argc == 1) {
         usage(argv[0]);
         exit(0);
     }

-    
+

     while ((ch = getopt(argc, argv, "hf:l:r:t:p:m:M:L:R:")) != -1) {
         switch (ch) {
             case 'h':
     while ((ch = getopt(argc, argv, "hf:l:r:t:p:m:M:L:R:")) != -1) {
         switch (ch) {
             case 'h':


@@ -167,12 +167,12 @@ main(int argc, char * const argv[]) {
             case 'l':
                 if ((error = getaddrinfo(optarg, NULL, NULL, &p_localaddr)))
                     errx(1, "getaddrinfo returned error: %s", gai_strerror(error));
             case 'l':
                 if ((error = getaddrinfo(optarg, NULL, NULL, &p_localaddr)))
                     errx(1, "getaddrinfo returned error: %s", gai_strerror(error));

-                
+

                 break;
             case 'r':
                 if ((error = getaddrinfo(optarg, NULL, NULL, &p_remoteaddr)))
                     errx(1, "getaddrinfo returned error: %s", gai_strerror(error));
                 break;
             case 'r':
                 if ((error = getaddrinfo(optarg, NULL, NULL, &p_remoteaddr)))
                     errx(1, "getaddrinfo returned error: %s", gai_strerror(error));

-                
+

                 break;
             case 'm':
                 ip_act_mask = (uint32_t)atoi(optarg);
                 break;
             case 'm':
                 ip_act_mask = (uint32_t)atoi(optarg);


@@ -197,34 +197,34 @@ main(int argc, char * const argv[]) {
                     errx(1, "Protocol not supported.");
                 }
                 break;
                     errx(1, "Protocol not supported.");
                 }
                 break;

-                
+

             case 'L':
             case 'L':

-                local_port = (uint16_t)atoi(optarg);
+                local_port = htons((uint16_t)atoi(optarg));

                 break;
             case 'R':
                 break;
             case 'R':

-                remote_port = (uint16_t)atoi(optarg);
+                remote_port = htons((uint16_t)atoi(optarg));

                 break;
             case 'M':
                 proto_act_mask = (uint32_t)atoi(optarg);
                 break;
                 break;
             case 'M':
                 proto_act_mask = (uint32_t)atoi(optarg);
                 break;

-                
+

             default:
                 warnx("# syntax error, unknow option '%d'", ch);
                 usage(argv[0]);
                 exit(0);
         }
     }
             default:
                 warnx("# syntax error, unknow option '%d'", ch);
                 usage(argv[0]);
                 exit(0);
         }
     }

-    
+

     if (p_localaddr && p_remoteaddr) {
         if (p_localaddr->ai_family!=p_remoteaddr->ai_family) {
             errx(1, "The address families for local and remote address"
                  " when both present, must be equal");
         }
     }
     if (p_localaddr && p_remoteaddr) {
         if (p_localaddr->ai_family!=p_remoteaddr->ai_family) {
             errx(1, "The address families for local and remote address"
                  " when both present, must be equal");
         }
     }

-    
-    
+
+

     doit();
     doit();

-    
+

     return (0);
 }
 
     return (0);
 }
 


@@ -233,18 +233,18 @@ int
 doit()
 {
     struct sockaddr_ctl addr;
 doit()
 {
     struct sockaddr_ctl addr;

-    
+

     sf = socket(PF_SYSTEM, SOCK_DGRAM, SYSPROTO_CONTROL);
     if (sf == -1) {
         err(1, "socket()");
     }
     sf = socket(PF_SYSTEM, SOCK_DGRAM, SYSPROTO_CONTROL);
     if (sf == -1) {
         err(1, "socket()");
     }

-    
+

     /* Connect the socket */
     bzero(&addr, sizeof(addr));
     addr.sc_len = sizeof(addr);
     addr.sc_family = AF_SYSTEM;
     addr.ss_sysaddr = AF_SYS_CONTROL;
     /* Connect the socket */
     bzero(&addr, sizeof(addr));
     addr.sc_len = sizeof(addr);
     addr.sc_family = AF_SYSTEM;
     addr.ss_sysaddr = AF_SYS_CONTROL;

-    
+

     {
         struct ctl_info info;
         memset(&info, 0, sizeof(info));
     {
         struct ctl_info info;
         memset(&info, 0, sizeof(info));


@@ -256,20 +256,20 @@ doit()
         addr.sc_id = info.ctl_id;
         addr.sc_unit = 1;
     }
         addr.sc_id = info.ctl_id;
         addr.sc_unit = 1;
     }

-    
+

     if (connect(sf, (struct sockaddr *)&addr, sizeof(struct sockaddr_ctl)) == -1) {
         err(1, "connect()");
     }
     if (connect(sf, (struct sockaddr *)&addr, sizeof(struct sockaddr_ctl)) == -1) {
         err(1, "connect()");
     }

-    
+

     if (setsockopt(sf, SYSPROTO_CONTROL, PKT_MNGLR_OPT_DIRECTION,
                    &dir, sizeof(uint32_t)) == -1) {
         err(1, "setsockopt could not set direction.");
     }
     if (setsockopt(sf, SYSPROTO_CONTROL, PKT_MNGLR_OPT_DIRECTION,
                    &dir, sizeof(uint32_t)) == -1) {
         err(1, "setsockopt could not set direction.");
     }

-    
+

     /* Set the IP addresses for the flow */
     if (p_localaddr) {
         l_saddr = *((struct sockaddr_storage *)(p_localaddr->ai_addr));
     /* Set the IP addresses for the flow */
     if (p_localaddr) {
         l_saddr = *((struct sockaddr_storage *)(p_localaddr->ai_addr));

-        
+

         if (setsockopt(sf, SYSPROTO_CONTROL, PKT_MNGLR_OPT_LOCAL_IP,
                        &l_saddr, sizeof(struct sockaddr_storage)) == -1) {
             err(1, "setsockopt could not set local address.");
         if (setsockopt(sf, SYSPROTO_CONTROL, PKT_MNGLR_OPT_LOCAL_IP,
                        &l_saddr, sizeof(struct sockaddr_storage)) == -1) {
             err(1, "setsockopt could not set local address.");


@@ -277,10 +277,10 @@ doit()
         freeaddrinfo(p_localaddr);
         p_localaddr = NULL;
     }
         freeaddrinfo(p_localaddr);
         p_localaddr = NULL;
     }

-    
+

     if (p_remoteaddr) {
         r_saddr = *((struct sockaddr_storage *)(p_remoteaddr->ai_addr));
     if (p_remoteaddr) {
         r_saddr = *((struct sockaddr_storage *)(p_remoteaddr->ai_addr));

-        
+

         if (setsockopt(sf, SYSPROTO_CONTROL, PKT_MNGLR_OPT_REMOTE_IP,
                        &r_saddr, sizeof(struct sockaddr_storage)) == -1) {
             err(1, "setsockopt could not set remote address.");
         if (setsockopt(sf, SYSPROTO_CONTROL, PKT_MNGLR_OPT_REMOTE_IP,
                        &r_saddr, sizeof(struct sockaddr_storage)) == -1) {
             err(1, "setsockopt could not set remote address.");


@@ -288,42 +288,42 @@ doit()
         freeaddrinfo(p_remoteaddr);
         p_remoteaddr = NULL;
     }
         freeaddrinfo(p_remoteaddr);
         p_remoteaddr = NULL;
     }

-    
+

     /* Set ports for the flow */
     if (local_port && (setsockopt(sf, SYSPROTO_CONTROL, PKT_MNGLR_OPT_LOCAL_PORT,
                                   &local_port, sizeof(uint16_t)) == -1)) {
         err(1, "setsockopt could not set local port.");
     /* Set ports for the flow */
     if (local_port && (setsockopt(sf, SYSPROTO_CONTROL, PKT_MNGLR_OPT_LOCAL_PORT,
                                   &local_port, sizeof(uint16_t)) == -1)) {
         err(1, "setsockopt could not set local port.");

-        
+

     }
     }

-    
+

     if (remote_port && (setsockopt(sf, SYSPROTO_CONTROL, PKT_MNGLR_OPT_REMOTE_PORT,
                                    &remote_port, sizeof(uint16_t)) == -1)) {
         err(1, "setsockopt could not set remote port.");
     if (remote_port && (setsockopt(sf, SYSPROTO_CONTROL, PKT_MNGLR_OPT_REMOTE_PORT,
                                    &remote_port, sizeof(uint16_t)) == -1)) {
         err(1, "setsockopt could not set remote port.");

-        
+

     }
     }

-    
+

     if (protocol && setsockopt(sf, SYSPROTO_CONTROL, PKT_MNGLR_OPT_PROTOCOL,
                                &protocol, sizeof(uint32_t)) == -1) {
         err(1, "setsockopt could not set protocol.");
     }
     if (protocol && setsockopt(sf, SYSPROTO_CONTROL, PKT_MNGLR_OPT_PROTOCOL,
                                &protocol, sizeof(uint32_t)) == -1) {
         err(1, "setsockopt could not set protocol.");
     }

-    
+

     if (proto_act_mask &&
         (setsockopt(sf, SYSPROTO_CONTROL, PKT_MNGLR_OPT_PROTO_ACT_MASK,
                     &proto_act_mask, sizeof(uint32_t))==-1)) {
         err(1, "setsockopt could not set protocol action mask.");
     }
     if (proto_act_mask &&
         (setsockopt(sf, SYSPROTO_CONTROL, PKT_MNGLR_OPT_PROTO_ACT_MASK,
                     &proto_act_mask, sizeof(uint32_t))==-1)) {
         err(1, "setsockopt could not set protocol action mask.");
     }

-    
+

     if (setsockopt(sf, SYSPROTO_CONTROL, PKT_MNGLR_OPT_ACTIVATE,
                    &activate, sizeof(uint8_t))== -1) {
         err(1, "setsockopt could not activate packet mangler.");
     }
     if (setsockopt(sf, SYSPROTO_CONTROL, PKT_MNGLR_OPT_ACTIVATE,
                    &activate, sizeof(uint8_t))== -1) {
         err(1, "setsockopt could not activate packet mangler.");
     }

-    
+

     if (!duration) {
         pause();
     } else {
         sleep(duration);
     }
     if (!duration) {
         pause();
     } else {
         sleep(duration);
     }

-    
+

     close(sf);
     return 0;
 }
     close(sf);
     return 0;
 }