Changeset 1601 for pjproject/trunk/pjlib/src/pj/sock_symbian.cpp

Timestamp:

Dec 1, 2007 8:52:57 AM (16 years ago)

Author:

bennylp

Message:

More ticket #415: more IPv6 and some reorganization of the source codes

File:

• pjproject/trunk/pjlib/src/pj/sock_symbian.cpp (modified) (15 diffs)

pjproject/trunk/pjlib/src/pj/sock_symbian.cpp

@@ -443 +443 @@
 
 /*
- * Convert address string with numbers and dots to binary IP address.
- */ 
-PJ_DEF(pj_in_addr) pj_inet_addr(const pj_str_t *cp)
-{
-    pj_in_addr addr;
-
-    pj_inet_aton(cp, &addr);
-    return addr;
-}
-
-/*
- * Convert address string with numbers and dots to binary IP address.
- */ 
-PJ_DEF(pj_in_addr) pj_inet_addr2(const char *cp)
-{
-    pj_str_t str = pj_str((char*)cp);
-    return pj_inet_addr(&str);
-}
-
-/*
- * 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
- * standard numbers and dots notation or may be a hostname. If hostname
- * is specified, then the function will resolve the host into the IP
- * address.
- */
-PJ_DEF(pj_status_t) pj_sockaddr_in_set_str_addr( pj_sockaddr_in *addr,
-                                                 const pj_str_t *str_addr)
-{
-    PJ_CHECK_STACK();
-
-    PJ_ASSERT_RETURN(!str_addr || str_addr->slen < PJ_MAX_HOSTNAME, 
-                     (addr->sin_addr.s_addr=PJ_INADDR_NONE, PJ_EINVAL));
-
-    addr->sin_family = PJ_AF_INET;
-    pj_memset(addr->sin_zero, 0, sizeof(addr->sin_zero));
-
-    if (str_addr && str_addr->slen) {
-        addr->sin_addr = pj_inet_addr(str_addr);
-        if (addr->sin_addr.s_addr == PJ_INADDR_NONE) {
-            pj_hostent he;
-            pj_status_t rc;
-
-            rc = pj_gethostbyname(str_addr, &he);
-            if (rc == 0) {
-                addr->sin_addr.s_addr = *(pj_uint32_t*)he.h_addr;
-            } else {
-                addr->sin_addr.s_addr = PJ_INADDR_NONE;
-                return rc;
-            }
-        }
-
-    } else {
-        addr->sin_addr.s_addr = 0;
-    }
-
-    return PJ_SUCCESS;
-}
-
-/*
- * Set the IP address and port of an IP socket address.
- * The string address may be in a standard numbers and dots notation or 
- * may be a hostname. If hostname is specified, then the function will 
- * resolve the host into the IP address.
- */
-PJ_DEF(pj_status_t) pj_sockaddr_in_init( pj_sockaddr_in *addr,
-                                         const pj_str_t *str_addr,
-                                         pj_uint16_t port)
-{
-    PJ_ASSERT_RETURN(addr, (addr->sin_addr.s_addr=PJ_INADDR_NONE, PJ_EINVAL));
-
-    addr->sin_family = PJ_AF_INET;
-    pj_memset(addr->sin_zero, 0, sizeof(addr->sin_zero));
-    pj_sockaddr_in_set_port(addr, port);
-    return pj_sockaddr_in_set_str_addr(addr, str_addr);
-}
-
- 
-/*
  * Get hostname.
  */
@@ -532 +453 @@
 
     if (hostname.ptr == NULL) {
-        RHostResolver & resv = PjSymbianOS::Instance()->GetResolver();
+        RHostResolver &resv = PjSymbianOS::Instance()->GetResolver(PJ_AF_INET);
         TRequestStatus reqStatus;
         THostName tmpName;
@@ -545 +466 @@
     return &hostname;
 }
-
-/*
- * Get first IP address associated with the hostname.
- */
-PJ_DEF(pj_in_addr) pj_gethostaddr(void)
-{
-    pj_sockaddr_in addr;
-    const pj_str_t *hostname = pj_gethostname();
-
-    pj_sockaddr_in_set_str_addr(&addr, hostname);
-    return addr.sin_addr;
-}
-
 
 /*
@@ -597 +505 @@
 
     /* Wrap Symbian RSocket into PJLIB's CPjSocket, and return to caller */
-    CPjSocket *pjSock = new CPjSocket(rSock);
+    CPjSocket *pjSock = new CPjSocket(af, rSock);
     *p_sock = (pj_sock_t)pjSock;
 
@@ -611 +519 @@
                                   int len)
 {
+    pj_status_t status;
     TInt rc;
 
@@ -616 +525 @@
 
     PJ_ASSERT_RETURN(sock != 0, PJ_EINVAL);
-    PJ_ASSERT_RETURN(addr && len == sizeof(pj_sockaddr_in), PJ_EINVAL);
-
-    // Convert PJLIB's pj_sockaddr_in into Symbian's TInetAddr
+    PJ_ASSERT_RETURN(addr && len >= sizeof(pj_sockaddr_in), PJ_EINVAL);
+
+    // Convert PJLIB's pj_sockaddr into Symbian's TInetAddr
     TInetAddr inetAddr;
-    PjSymbianOS::pj2Addr(*(pj_sockaddr_in*)addr, inetAddr);
+    status = PjSymbianOS::pj2Addr(*(pj_sockaddr*)addr, len, inetAddr);
+    if (status != PJ_SUCCESS)
+        return status;
 
     // Get the RSocket instance
@@ -690 +601 @@
     rSock.RemoteName(inetAddr);
 
-    PjSymbianOS::Addr2pj(inetAddr, *(pj_sockaddr_in*)addr);
-    *namelen = sizeof(pj_sockaddr_in);
-
-    return PJ_SUCCESS;
+    return PjSymbianOS::Addr2pj(inetAddr, *(pj_sockaddr*)addr, namelen);
 }
 
@@ -714 +622 @@
     rSock.LocalName(inetAddr);
 
-    PjSymbianOS::Addr2pj(inetAddr, *(pj_sockaddr_in*)addr);
-    *namelen = sizeof(pj_sockaddr_in);
-
-    return PJ_SUCCESS;
+    return PjSymbianOS::Addr2pj(inetAddr, *(pj_sockaddr*)addr, namelen);
 }
 
@@ -762 +667 @@
                                    int tolen)
 {
+    pj_status_t status;
+    
     PJ_CHECK_STACK();
     PJ_ASSERT_RETURN(sock && buf && len, PJ_EINVAL);
@@ -769 +676 @@
 
     // Only supports AF_INET for now
-    PJ_ASSERT_RETURN(tolen==sizeof(pj_sockaddr_in) && 
-                     ((pj_sockaddr*)to)->addr.sa_family == PJ_AF_INET, 
-                     PJ_EINVAL);
+    PJ_ASSERT_RETURN(tolen >= sizeof(pj_sockaddr_in), PJ_EINVAL);
 
     TInetAddr inetAddr;
-    PjSymbianOS::pj2Addr(*(pj_sockaddr_in*)to, inetAddr);
+    status = PjSymbianOS::pj2Addr(*(pj_sockaddr*)to, tolen, inetAddr);
+    if (status != PJ_SUCCESS)
+        return status;
 
     TPtrC8 data((const TUint8*)buf, (TInt)*len);
@@ -877 +784 @@
 
             if (from && fromlen) {
-                PjSymbianOS::Addr2pj(inetAddr, *(pj_sockaddr_in*)from);
-                *fromlen = sizeof(pj_sockaddr_in);
+                return PjSymbianOS::Addr2pj(inetAddr, *(pj_sockaddr*)from, 
+                                            fromlen);
+            } else {
+                return PJ_SUCCESS;
             }
-            return PJ_SUCCESS;
         }
     }
@@ -895 +803 @@
         //*len = (TInt)recvLen.Length();
         *len = data.Length();
-        *fromlen = sizeof(pj_sockaddr_in);
-        PjSymbianOS::Addr2pj(inetAddr, *(pj_sockaddr_in*)from);
-        return PJ_SUCCESS;
+        return PjSymbianOS::Addr2pj(inetAddr, *(pj_sockaddr*)from, fromlen);
     } else {
         *len = -1;
@@ -948 +854 @@
                                      int namelen)
 {
+    pj_status_t status;
+    
     PJ_CHECK_STACK();
 
@@ -960 +868 @@
     TRequestStatus reqStatus;
 
-    PjSymbianOS::pj2Addr(*(pj_sockaddr_in*)addr, inetAddr);
+    status = PjSymbianOS::pj2Addr(*(pj_sockaddr*)addr, namelen, inetAddr);
+    if (status != PJ_SUCCESS)
+        return status;
 
     rSock.Connect(inetAddr, reqStatus);
@@ -1060 +970 @@
 
     // Create PJ socket
-    CPjSocket *newPjSock = new CPjSocket(newSock);
+    CPjSocket *newPjSock = new CPjSocket(pjSock->GetAf(), newSock);
     newPjSock->SetConnected(true);