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

Timestamp:

May 3, 2007 1:31:21 PM (17 years ago)

Author:

bennylp

Message:

Implemented ticket #246, #247, #261, #268, #250 for Symbian

File:

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

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

@@ -211 +211 @@
 PJ_DEF(pj_uint16_t) pj_ntohs(pj_uint16_t netshort)
 {
-    /* There's no difference in host/network byte order in Symbian */
+#if PJ_IS_LITTLE_ENDIAN
+    return pj_swap16(netshort);
+#else
     return netshort;
+#endif
 }
 
@@ -220 +223 @@
 PJ_DEF(pj_uint16_t) pj_htons(pj_uint16_t hostshort)
 {
-    /* There's no difference in host/network byte order in Symbian */
+#if PJ_IS_LITTLE_ENDIAN
+    return pj_swap16(hostshort);
+#else
     return hostshort;
+#endif
 }
 
@@ -229 +235 @@
 PJ_DEF(pj_uint32_t) pj_ntohl(pj_uint32_t netlong)
 {
-    /* There's no difference in host/network byte order in Symbian */
+#if PJ_IS_LITTLE_ENDIAN
+    return pj_swap32(netlong);
+#else
     return netlong;
+#endif
 }
 
@@ -238 +247 @@
 PJ_DEF(pj_uint32_t) pj_htonl(pj_uint32_t hostlong)
 {
-    /* There's no difference in host/network byte order in Symbian */
-    return hostlong;
+#if PJ_IS_LITTLE_ENDIAN
+    return pj_swap32(hostlong);
+#else
+    return netlong;
+#endif
 }
 
@@ -251 +263 @@
     static char str8[20];
 
-    TInetAddr temp_addr((TUint32)inaddr.s_addr, (TUint)0);
+    /* (Symbian IP address is in host byte order) */
+    TInetAddr temp_addr((TUint32)pj_ntohl(inaddr.s_addr), (TUint)0);
     temp_addr.Output(str16);
  
@@ -295 +308 @@
     addr.Init(KAfInet);
     if (addr.Input(ip_addr) == KErrNone) {
-        /* Success */
-        inp->s_addr = addr.Address();
+        /* Success (Symbian IP address is in host byte order) */
+        inp->s_addr = pj_htonl(addr.Address());
         return 1;
     } else {
@@ -498 +511 @@
     PJ_CHECK_STACK();
 
-    pj_memset(&addr, 0, sizeof(addr));
+    pj_bzero(&addr, sizeof(addr));
     addr.sin_family = PJ_AF_INET;
     addr.sin_addr.s_addr = pj_htonl(addr32);