Merge branch 'apache:master' into ostest

Author: zzby0

examples/buttons/buttons_main.c

@@ -219,9 +219,11 @@ static int button_daemon(int argc, char *argv[])
       goto errout_with_fd;
     }
 
+#ifdef CONFIG_ENABLE_ALL_SIGNALS
   /* Ignore the default signal action */
 
   signal(CONFIG_EXAMPLES_BUTTONS_SIGNO, SIG_IGN);
+#endif /* CONFIG_ENABLE_ALL_SIGNALS */
 #endif
 
   /* Now loop forever, waiting BUTTONs events */

examples/chrono/chrono_main.c

@@ -165,9 +165,11 @@ static int chrono_daemon(int argc, char *argv[])
       goto errout_with_fd;
     }
 
+#ifdef CONFIG_ENABLE_ALL_SIGNALS
   /* Ignore the default signal action */
 
   signal(BUTTON_SIGNO, SIG_IGN);
+#endif
 
   /* Now loop forever, waiting BUTTONs events */
 

graphics/libyuv/CMakeLists.txt

@@ -41,7 +41,7 @@ if(CONFIG_LIBYUV)
     FetchContent_GetProperties(libyuv_fetch)
 
     if(NOT libyuv_fetch_POPULATED)
-      FetchContent_Populate(llibyuv_fetch)
+      FetchContent_Populate(libyuv_fetch)
     endif()
   endif()
 

include/netutils/netlib.h

@@ -56,6 +56,11 @@
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/netconfig.h>
 
+#ifdef CONFIG_NET_IPTABLES
+#  include <nuttx/net/netfilter/ip_tables.h>
+#  include <nuttx/net/netfilter/ip6_tables.h>
+#endif
+
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/

netutils/dhcpc/dhcpc.c

@@ -533,8 +533,16 @@ static void *dhcpc_run(void *args)
   struct dhcpc_state result;
   int ret;
 
+#ifndef CONFIG_ENABLE_ALL_SIGNALS
+  pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
+  pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL);
+#endif
+
   while (1)
     {
+#ifndef CONFIG_ENABLE_ALL_SIGNALS
+      pthread_testcancel();
+#endif
       ret = dhcpc_request(pdhcpc, &result);
       if (ret == OK)
         {
@@ -701,7 +709,9 @@ void dhcpc_close(FAR void *handle)
 void dhcpc_cancel(FAR void *handle)
 {
   struct dhcpc_state_s *pdhcpc = (struct dhcpc_state_s *)handle;
+#ifdef CONFIG_ENABLE_ALL_SIGNALS
   sighandler_t old;
+#endif
   int ret;
 
   if (pdhcpc)
@@ -710,6 +720,7 @@ void dhcpc_cancel(FAR void *handle)
 
       if (pdhcpc->thread)
         {
+#ifdef CONFIG_ENABLE_ALL_SIGNALS
           old = signal(SIGQUIT, SIG_IGN);
 
           /* Signal the dhcpc_run */
@@ -719,6 +730,9 @@ void dhcpc_cancel(FAR void *handle)
             {
               nerr("ERROR: pthread_kill DHCPC thread\n");
             }
+#else
+          pthread_cancel(pdhcpc->thread);
+#endif
 
           /* Wait for the end of dhcpc_run */
 
@@ -729,7 +743,9 @@ void dhcpc_cancel(FAR void *handle)
             }
 
           pdhcpc->thread = 0;
+#ifdef CONFIG_ENABLE_ALL_SIGNALS
           signal(SIGQUIT, old);
+#endif
         }
     }
 }

netutils/dhcpd/dhcpd.c

@@ -1555,13 +1555,15 @@ static pid_t dhcpd_get_pid(void)
  *
  ****************************************************************************/
 
+#ifdef CONFIG_ENABLE_ALL_SIGNALS
 static void
 dhcpd_signal_handler(int signo, FAR siginfo_t *info, FAR void *ctx)
 {
   /* Set global flag to indicate stop request */
 
   g_dhcpd_daemon.ds_state = DHCPD_STOP_REQUESTED;
 }
+#endif
 
 /****************************************************************************
  * Public Functions
@@ -1573,7 +1575,9 @@ dhcpd_signal_handler(int signo, FAR siginfo_t *info, FAR void *ctx)
 
 int dhcpd_run(FAR const char *interface)
 {
+#ifdef CONFIG_ENABLE_ALL_SIGNALS
   struct sigaction act;
+#endif
   int sockfd = -1;
   int nbytes;
 
@@ -1602,11 +1606,12 @@ int dhcpd_run(FAR const char *interface)
 
   /* Install signal handler for CONFIG_NETUTILS_DHCPD_SIGWAKEUP */
 
+#ifdef CONFIG_ENABLE_ALL_SIGNALS
   memset(&act, 0, sizeof(act));
   act.sa_sigaction = dhcpd_signal_handler;
   act.sa_flags = SA_SIGINFO;
   sigaction(CONFIG_NETUTILS_DHCPD_SIGWAKEUP, &act, NULL);
-
+#endif
   /* Indicate that we have started */
 
   g_dhcpd_daemon.ds_state = DHCPD_RUNNING;

netutils/ping/icmp_ping.c

@@ -45,6 +45,7 @@
 
 #include <nuttx/clock.h>
 #include <nuttx/net/icmp.h>
+#include <nuttx/net/ip.h>
 
 #include "netutils/icmp_ping.h"
 
@@ -64,7 +65,6 @@ struct ping_priv_s
 {
   struct sockaddr_in destaddr;
   struct sockaddr_in fromaddr;
-  struct icmp_hdr_s outhdr;
   struct pollfd recvfd;
   socklen_t addrlen;
   clock_t kickoff;
@@ -74,6 +74,7 @@ struct ping_priv_s
   long elapsed;
   bool retry;
   int sockfd;
+  struct icmp_hdr_s outhdr;
 };
 
 /****************************************************************************
@@ -91,6 +92,7 @@ static volatile bool g_exiting;
  * Private Functions
  ****************************************************************************/
 
+#ifdef CONFIG_ENABLE_ALL_SIGNALS
 /****************************************************************************
  * Name: sigexit
  ****************************************************************************/
@@ -99,6 +101,7 @@ static void sigexit(int signo)
 {
   g_exiting = true;
 }
+#endif
 
 /****************************************************************************
  * Name: ping_newid
@@ -179,6 +182,31 @@ static void icmp_callback(FAR struct ping_result_s *result,
   result->info->callback(result);
 }
 
+/****************************************************************************
+ * Name: icmp_checksum
+ ****************************************************************************/
+
+static uint16_t icmp_checksum(FAR const void *buffer, size_t datalen)
+{
+  FAR const uint16_t *wptr = (FAR const uint16_t *)buffer;
+  size_t words = (sizeof(struct icmp_hdr_s) + datalen + 1) / 2;
+  uint32_t sum = 0;
+  size_t i;
+
+  for (i = 0; i < words; i++)
+    {
+      sum += *wptr++;
+      if (sum & 0x80000000)
+        {
+          sum = (sum & 0XFFFF) + (sum >> 16);
+        }
+    }
+
+  sum = (sum >> 16) + (sum & 0XFFFF);
+  sum += (sum >> 16);
+  return (uint16_t)(~sum);
+}
+
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -194,12 +222,15 @@ void icmp_ping(FAR const struct ping_info_s *info)
   FAR struct icmp_hdr_s *inhdr;
   FAR uint8_t *iobuffer;
   FAR uint8_t *ptr;
+  int recvlen;
   int ret;
   int ch;
   int i;
 
   g_exiting = false;
+#ifdef CONFIG_ENABLE_ALL_SIGNALS
   signal(SIGINT, sigexit);
+#endif
 
   /* Initialize result structure */
 
@@ -215,16 +246,17 @@ void icmp_ping(FAR const struct ping_info_s *info)
 
   /* Allocate memory to hold private data and ping buffer */
 
-  priv = malloc(sizeof(*priv) + result.outsize);
+  priv = malloc(sizeof(*priv) + sizeof(struct ipv4_hdr_s) + result.outsize);
+
   if (priv == NULL)
     {
       icmp_callback(&result, ICMP_E_MEMORY, 0);
       return;
     }
 
-  iobuffer = (FAR uint8_t *)(priv + 1);
+  iobuffer = (FAR uint8_t *)(&priv->outhdr);
 
-  priv->sockfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_ICMP);
+  priv->sockfd = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP);
   if (priv->sockfd < 0)
     {
       icmp_callback(&result, ICMP_E_SOCKET, errno);
@@ -253,11 +285,6 @@ void icmp_ping(FAR const struct ping_info_s *info)
   priv->destaddr.sin_port        = 0;
   priv->destaddr.sin_addr.s_addr = result.dest.s_addr;
 
-  memset(&priv->outhdr, 0, sizeof(struct icmp_hdr_s));
-  priv->outhdr.type              = ICMP_ECHO_REQUEST;
-  priv->outhdr.id                = htons(result.id);
-  priv->outhdr.seqno             = htons(result.seqno);
-
   icmp_callback(&result, ICMP_I_BEGIN, 0);
 
   while (result.nrequests < info->count)
@@ -267,9 +294,10 @@ void icmp_ping(FAR const struct ping_info_s *info)
           break;
         }
 
-      /* Copy the ICMP header into the I/O buffer */
-
-      memcpy(iobuffer, &priv->outhdr, sizeof(struct icmp_hdr_s));
+      memset(&priv->outhdr, 0, sizeof(struct icmp_hdr_s));
+      priv->outhdr.type  = ICMP_ECHO_REQUEST;
+      priv->outhdr.id    = htons(result.id);
+      priv->outhdr.seqno = htons(result.seqno);
 
       /* Add some easily verifiable payload data */
 
@@ -285,6 +313,10 @@ void icmp_ping(FAR const struct ping_info_s *info)
             }
         }
 
+      /* Calculate checksum after data padding */
+
+      priv->outhdr.icmpchksum = icmp_checksum(iobuffer, info->datalen);
+
       priv->start = clock();
       result.nrequests++;
       priv->nsent = sendto(priv->sockfd, iobuffer, result.outsize, 0,
@@ -330,9 +362,10 @@ void icmp_ping(FAR const struct ping_info_s *info)
 
           /* Get the ICMP response (ignoring the sender) */
 
+          recvlen = sizeof(struct ipv4_hdr_s) + result.outsize;
           priv->addrlen = sizeof(struct sockaddr_in);
           priv->nrecvd  = recvfrom(priv->sockfd, iobuffer,
-                                   result.outsize, 0,
+                                   recvlen, 0,
                                    (FAR struct sockaddr *)&priv->fromaddr,
                                    &priv->addrlen);
           if (priv->nrecvd < 0)
@@ -346,8 +379,11 @@ void icmp_ping(FAR const struct ping_info_s *info)
               goto wait;
             }
 
+          /* Skip IP header, IP header length including options */
+
           priv->elapsed = TICK2USEC(clock() - priv->start);
-          inhdr         = (FAR struct icmp_hdr_s *)iobuffer;
+          inhdr         = (FAR struct icmp_hdr_s *)
+                          (iobuffer + sizeof(struct ipv4_hdr_s));
 
           if (inhdr->type == ICMP_ECHO_REPLY)
             {
@@ -379,16 +415,17 @@ void icmp_ping(FAR const struct ping_info_s *info)
 
                   /* Verify the payload data */
 
-                  if (priv->nrecvd != result.outsize)
+                  if (priv->nrecvd != recvlen)
                     {
                       icmp_callback(&result, ICMP_W_RECVBIG, priv->nrecvd);
                       verified = false;
                     }
                   else
                     {
-                      ptr = &iobuffer[sizeof(struct icmp_hdr_s)];
-                      ch  = 0x20;
+                      /* Data start offset: IP header + ICMP header */
 
+                      ptr = (FAR uint8_t *)(inhdr + 1);
+                      ch  = 0x20;
                       for (i = 0; i < info->datalen; i++, ptr++)
                         {
                           if (*ptr != ch)

netutils/telnetd/telnetd_daemon.c

@@ -74,7 +74,7 @@ int telnetd_daemon(FAR const struct telnetd_config_s *config)
 #endif
   } addr;
 
-#ifdef CONFIG_SCHED_HAVE_PARENT
+#if defined(CONFIG_SCHED_HAVE_PARENT) && defined(CONFIG_ENABLE_ALL_SIGNALS)
   struct sigaction sa;
   sigset_t blockset;
 #endif
@@ -85,7 +85,7 @@ int telnetd_daemon(FAR const struct telnetd_config_s *config)
   int optval;
 #endif
 
-#ifdef CONFIG_SCHED_HAVE_PARENT
+#if defined(CONFIG_SCHED_HAVE_PARENT) && defined(CONFIG_ENABLE_ALL_SIGNALS)
   /* Call sigaction with the SA_NOCLDWAIT flag so that we do not transform
    * children into "zombies" when they terminate:  Child exit status will
    * not be retained.
@@ -113,7 +113,7 @@ int telnetd_daemon(FAR const struct telnetd_config_s *config)
       nerr("ERROR: sigprocmask failed: %d\n", errno);
       goto errout;
     }
-#endif /* CONFIG_SCHED_HAVE_PARENT */
+#endif /* CONFIG_SCHED_HAVE_PARENT && CONFIG_ENABLE_ALL_SIGNALS */
 
   /* Create a new TCP socket to use to listen for connections */