Merge tag '2024-12-13' into push-2024-12-13

Change-Id: I327691998a17c443cbd0772fc4a1433ba868e81e
intel · Dec 14, 2024 · 71623ca · 71623ca
2 parents 3b17a62 + 911b59c
commit 71623ca
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/pcm-sensor-server.cpp b/src/pcm-sensor-server.cpp
@@ -1301,10 +1301,10 @@ class Server {
         SignalHandler* shi = SignalHandler::getInstance();
         shi->setSocket( serverSocket_ );
         shi->ignoreSignal( SIGPIPE ); // Sorry Dennis Ritchie, we do not care about this, we always check return codes
-        #ifndef UNIT_TEST // libFuzzer installs own signal handlers
+#ifndef UNIT_TEST // libFuzzer installs own signal handlers
         shi->installHandler( SignalHandler::handleSignal, SIGTERM );
         shi->installHandler( SignalHandler::handleSignal, SIGINT );
-        #endif
+#endif
     }
     Server( Server const & ) = delete;
     Server & operator = ( Server const & ) = delete;
@@ -1320,26 +1320,26 @@ class Server {
         if ( port_ == 0 )
             throw std::runtime_error( "Server Constructor: No port specified." );
 
-        int sockfd = ::socket( AF_INET, SOCK_STREAM, 0 );
+        int sockfd = ::socket( AF_INET6, SOCK_STREAM, 0 );
         if ( -1 == sockfd )
             throw std::runtime_error( "Server Constructor: Can´t create socket" );
 
         int retval = 0;
 
-        struct sockaddr_in serv;
-        serv.sin_family = AF_INET;
-        serv.sin_port = htons( port_ );
+        struct sockaddr_in6 serv;
+        serv.sin6_family = AF_INET6;
+        serv.sin6_port = htons( port_ );
         if ( listenIP_.empty() )
-            serv.sin_addr.s_addr = INADDR_ANY;
+            serv.sin6_addr = in6addr_any;
         else {
-            if ( 1 != ::inet_pton( AF_INET, listenIP_.c_str(), &(serv.sin_addr) ) )
+            if ( 1 != ::inet_pton( AF_INET6, listenIP_.c_str(), &(serv.sin6_addr) ) )
             {
                 DBG( 3, "close clientsocketFD" );
                 ::close(sockfd);
                 throw std::runtime_error( "Server Constructor: Cannot convert IP string" );
             }
         }
-        socklen_t len = sizeof( struct sockaddr_in );
+        socklen_t len = sizeof( struct sockaddr_in6 );
         retval = ::bind( sockfd, reinterpret_cast<struct sockaddr*>(&serv), len );
         if ( 0 != retval ) {
             DBG( 3, "close clientsocketFD" );

diff --git a/src/simdjson b/src/simdjson
+2 −3		.github/workflows/documentation.yml
+1 −1		CMakeLists.txt
+1 −1		Doxyfile
+8 −8		include/simdjson/concepts.h
+1 −1		include/simdjson/error.h
+2 −2		include/simdjson/padded_string-inl.h
+2 −2		include/simdjson/padded_string.h
+2 −2		include/simdjson/simdjson_version.h
+18 −10		singleheader/simdjson.cpp
+16 −16		singleheader/simdjson.h
+1 −0		src/arm64.cpp
+1 −0		src/fallback.cpp
+1 −0		src/haswell.cpp
+1 −0		src/icelake.cpp
+1 −0		src/lasx.cpp
+1 −0		src/lsx.cpp
+1 −0		src/ppc64.cpp
+1 −0		src/westmere.cpp