Changeset 1608 for pjproject/trunk/pjlib/src/pj/sock_common.c

Timestamp:

Dec 2, 2007 3:36:46 PM (16 years ago)

Author:

bennylp

Message:

More ticket #415: Added pj_sockaddr_get_len() and pj_inet_ntop2(), and fixed Symbian combilation warnings with gcce

File:

• pjproject/trunk/pjlib/src/pj/sock_common.c (modified) (3 diffs)

pjproject/trunk/pjlib/src/pj/sock_common.c

@@ -48 +48 @@
 
 /*
+ * Get text representation.
+ */
+PJ_DEF(char*) pj_inet_ntop2( int af, const void *src,
+                             char *dst, int size)
+{
+    pj_status_t status;
+
+    status = pj_inet_ntop(af, src, dst, size);
+    return (status==PJ_SUCCESS)? dst : NULL;
+}
+
+/*
  * Set the IP address of an IP socket address from string address, 
  * with resolving the host if necessary. The string address may be in a
@@ -254 +266 @@
 
 /*
+ * Get socket address length.
+ */
+PJ_DEF(unsigned) pj_sockaddr_get_len(const pj_sockaddr_t *addr)
+{
+    const pj_sockaddr *a = (const pj_sockaddr*) addr;
+    PJ_ASSERT_RETURN(a->addr.sa_family == PJ_AF_INET ||
+                     a->addr.sa_family == PJ_AF_INET6, PJ_EAFNOTSUP);
+    return a->addr.sa_family == PJ_AF_INET6 ?
+            sizeof(pj_sockaddr_in6) : sizeof(pj_sockaddr_in);
+}
+
+/*
  * Set port number of pj_sockaddr_in
  */
@@ -270 +294 @@
     int af = addr->addr.sa_family;
 
-    PJ_ASSERT_ON_FAIL(af == PJ_AF_INET || af == PJ_AF_INET6, 
-                      PJ_EINVAL);
+    PJ_ASSERT_RETURN(af==PJ_AF_INET || af==PJ_AF_INET6, PJ_EINVAL);
 
     if (af == PJ_AF_INET6)