Changeset 1585 for pjproject/trunk/pjlib/include/pj/sock.h

Timestamp:

Nov 18, 2007 2:53:47 PM (16 years ago)

Author:

bennylp

Message:

Ticket #415: implement IPv6 support in PJLIB

File:

• pjproject/trunk/pjlib/include/pj/sock.h (modified) (8 diffs)

pjproject/trunk/pjlib/include/pj/sock.h

@@ -61 +61 @@
  */
 
+/** Address family is unspecified. @see pj_AF_UNSPEC() */
+extern const pj_uint16_t PJ_AF_UNSPEC;
+
 /** Unix domain socket. @see pj_AF_UNIX() */
 extern const pj_uint16_t PJ_AF_UNIX;
@@ -85 +88 @@
  */
 
+/** Get #PJ_AF_UNSPEC value */
+PJ_DECL(pj_uint16_t) pj_AF_UNSPEC(void);
 /** Get #PJ_AF_UNIX value. */
 PJ_DECL(pj_uint16_t) pj_AF_UNIX(void);
@@ -314 +319 @@
 
 /**
+ * Maximum length of text representation of an IPv4 address.
+ */
+#define PJ_INET_ADDRSTRLEN      16
+
+/**
+ * Maximum length of text representation of an IPv6 address.
+ */
+#define PJ_INET6_ADDRSTRLEN     46
+
+
+/**
  * This structure describes Internet socket address.
  * If PJ_SOCKADDR_HAS_LEN is not zero, then sin_zero_len member is added
@@ -334 +350 @@
 };
 
+
 #undef s6_addr
 
@@ -339 +356 @@
  * This structure describes IPv6 address.
  */
-typedef struct pj_in6_addr
-{
-    /** Union of address formats. */
-    union {
-        pj_uint8_t  u6_addr8[16];   /**< u6_addr8   */
-        pj_uint16_t u6_addr16[8];   /**< u6_addr16  */
-        pj_uint32_t u6_addr32[4];   /**< u6_addr32  */
-    } in6_u;
-/** Shortcut to access in6_u.u6_addr8. */
-#define s6_addr                 in6_u.u6_addr8
-/** Shortcut to access in6_u.u6_addr16. */
-#define s6_addr16               in6_u.u6_addr16
-/** Shortcut to access in6_u.u6_addr32. */
-#define s6_addr32               in6_u.u6_addr32
+typedef union pj_in6_addr
+{
+    /* This is the main entry */
+    pj_uint8_t  s6_addr[16];   /**< 8-bit array */
+
+    /* While these are used for proper alignment */
+    pj_uint32_t u6_addr32[4];
+#if defined(PJ_HAS_INT64) && PJ_HAS_INT64!=0
+    pj_int64_t  u6_addr64[2];
+#endif
+
 } pj_in6_addr;
+
 
 /** Initializer value for pj_in6_addr. */
@@ -372 +387 @@
 {
 #if defined(PJ_SOCKADDR_HAS_LEN) && PJ_SOCKADDR_HAS_LEN!=0
-    pj_uint8_t  sin_zero_len;       /**< Just ignore this.         */
-    pj_uint8_t  sin_family;         /**< Address family.           */
+    pj_uint8_t  sin6_zero_len;      /**< Just ignore this.         */
+    pj_uint8_t  sin6_family;        /**< Address family.           */
 #else
     pj_uint16_t sin6_family;        /**< Address family             */
@@ -380 +395 @@
     pj_uint32_t sin6_flowinfo;      /**< IPv6 flow information      */
     pj_in6_addr sin6_addr;          /**< IPv6 address.              */
-    pj_uint32_t sin6_scope_id;      /**< IPv6 scope-id              */
+    pj_uint32_t sin6_scope_id;      /**< Set of interfaces for a scope  */
 } pj_sockaddr_in6;
 
@@ -473 +488 @@
  */
 PJ_DECL(int) pj_inet_aton(const pj_str_t *cp, struct pj_in_addr *inp);
+
+/**
+ * This function converts an address in its standard text presentation form
+ * into its numeric binary form. It supports both IPv4 and IPv6 address
+ * conversion.
+ *
+ * @param af    Specify the family of the address.  The PJ_AF_INET and 
+ *              PJ_AF_INET6 address families shall be supported.  
+ * @param src   Points to the string being passed in. 
+ * @param dst   Points to a buffer into which the function stores the 
+ *              numeric address; this shall be large enough to hold the
+ *              numeric address (32 bits for PJ_AF_INET, 128 bits for
+ *              PJ_AF_INET6).  
+ *
+ * @return      PJ_SUCCESS if conversion was successful.
+ */
+PJ_DECL(pj_status_t) pj_inet_pton(int af, const pj_str_t *src, void *dst);
+
+/**
+ * This function converts a numeric address into a text string suitable
+ * for presentation. It supports both IPv4 and IPv6 address
+ * conversion.
+ *
+ * @param af    Specify the family of the address. This can be PJ_AF_INET
+ *              or PJ_AF_INET6.
+ * @param src   Points to a buffer holding an IPv4 address if the af argument
+ *              is PJ_AF_INET, or an IPv6 address if the af argument is
+ *              PJ_AF_INET6; the address must be in network byte order.  
+ * @param dst   Points to a buffer where the function stores the resulting
+ *              text string; it shall not be NULL.  
+ * @param size  Specifies the size of this buffer, which shall be large 
+ *              enough to hold the text string (PJ_INET_ADDRSTRLEN characters
+ *              for IPv4, PJ_INET6_ADDRSTRLEN characters for IPv6).
+ *
+ * @return      PJ_SUCCESS if conversion was successful..
+ */
+PJ_DECL(pj_status_t) pj_inet_ntop(int af, const void *src,
+                                  char *dst, int size);
 
 /**