Changeset 204

Timestamp:

08/17/99 23:08:40 (14 years ago)

Author:

ucaccsp

Message:

Fixup the new inet_pton() and inet_ntop() code.

Location:

common/trunk

Files:

• MODS (modified) (1 diff)
• src/inet_ntop.c (modified) (2 diffs)
• src/inet_pton.c (modified) (2 diffs)
• src/net_udp.c (modified) (2 diffs)

common/trunk/MODS

@@ -87 +87 @@
         - Updates to the RTP code from Markus Germeier: time-out and delete sources,
           fix X but in RTP header, add support for sending BYE packets.
+        - Add inet_pton() and inet_ntop() implementations, for those platforms
+          which are missing them.
 
 Still to do...

common/trunk/src/inet_ntop.c

@@ -17 +17 @@
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <string.h>
-#include <errno.h>
-#include <stdio.h>
+#ifdef NEED_INET_NTOP
+#include "config_unix.h"
+#include "config_win32.h"
 #include "inet_ntop.h"
 
@@ -198 +189 @@
         return (dst);
 }
+
+#endif
+

common/trunk/src/inet_pton.c

@@ -17 +17 @@
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <string.h>
-#include <errno.h>
+#ifdef NEED_INET_PTON
+#include "config_unix.h"
+#include "config_win32.h"
 #include "inet_pton.h"
 
@@ -224 +216 @@
         return (1);
 }
+
+#endif
+

common/trunk/src/net_udp.c

@@ -44 +44 @@
 #include "debug.h"
 #include "memory.h"
+#include "inet_pton.h"
+#include "inet_ntop.h"
 #include "net_udp.h"
 
@@ -175 +177 @@
         addr->s_addr = inet_addr(name);
         return (addr->s_addr != (in_addr_t) INADDR_NONE);
-}
-#endif
-
-#ifdef NEED_INET_PTON
-#ifdef NEED_INET_PTON_STATIC
-static 
-#endif
-int inet_pton(int family, const char *name, void *addr)
-{
-        if (family == AF_INET) {
-                struct in_addr  in_val;
-                
-                if (inet_aton(name, &in_val)) {
-                        memcpy(addr, &in_val, sizeof(struct in_addr));
-                        return 1;
-                }
-                return 0;
-#if defined (NEED_INET_PTON) && defined(HAVE_IPv6)
-        } else if (family == AF_INET6) {
-                return inet6_addr(name, addr);
-#endif
-        } else {
-                debug_msg("Unknown address family\n");
-                return -1;
-        }
 }
 #endif