Fix warnings in mupnp_socket_recv()

cybergarage · May 3, 2022 · 9cd3894 · 9cd3894
1 parent c2e903b
commit 9cd3894
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/src/mupnp/net/socket.c b/src/mupnp/net/socket.c
@@ -993,21 +993,16 @@ ssize_t mupnp_socket_recv(mUpnpSocket* sock, mUpnpDatagramPacket* dgmPkt)
   mupnp_socket_datagram_packet_setremoteaddress(dgmPkt, remoteAddr);
   mupnp_socket_datagram_packet_setremoteport(dgmPkt, ntohs(remoteHost.portno));
 #else
-
-  if (getnameinfo((struct sockaddr*)&from, fromLen, remoteAddr, sizeof(remoteAddr), remotePort, sizeof(remotePort), NI_NUMERICHOST | NI_NUMERICSERV) == 0) {
+  if (getnameinfo((struct sockaddr*)&from, fromLen, remoteAddr, sizeof(remoteAddr), remotePort, sizeof(remotePort), (NI_NUMERICHOST | NI_NUMERICSERV)) == 0) {
     mupnp_socket_datagram_packet_setremoteaddress(dgmPkt, remoteAddr);
-    mupnp_socket_datagram_packet_setremoteport(dgmPkt, mupnp_str2int(remotePort));
-  }
-  else {
-    mupnp_socket_datagram_packet_setremoteaddress(dgmPkt, inet_ntoa(((struct sockaddr_in*)&from)->sin_addr));
-    mupnp_socket_datagram_packet_setremoteport(dgmPkt, ((struct sockaddr_in*)&from)->sin_port);
+    mupnp_socket_datagram_packet_setremoteport(dgmPkt, atoi(remotePort));
   }
-
-  mupnp_log_debug_s("From pointer %p\n", &from);
+#endif
+
+#if !defined(BTRON) && !defined(ITRON) && !defined(ITRON)
   localAddr = mupnp_net_selectaddr((struct sockaddr*)&from);
   mupnp_socket_datagram_packet_setlocaladdress(dgmPkt, localAddr);
   free(localAddr);
-
 #endif
 
   mupnp_log_debug_l4("Leaving...\n");