You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mod_python-commits@quetz.apache.org by nl...@apache.org on 2005/11/12 19:59:38 UTC

svn commit: r332816 - /httpd/mod_python/trunk/src/connobject.c

Author: nlehuen
Date: Sat Nov 12 10:59:35 2005
New Revision: 332816

URL: http://svn.apache.org/viewcvs?rev=332816&view=rev
Log:
Fix for MODPYTHON-64. This needs to be tested with IPv6.

Modified:
    httpd/mod_python/trunk/src/connobject.c

Modified: httpd/mod_python/trunk/src/connobject.c
URL: http://svn.apache.org/viewcvs/httpd/mod_python/trunk/src/connobject.c?rev=332816&r1=332815&r2=332816&view=diff
==============================================================================
--- httpd/mod_python/trunk/src/connobject.c (original)
+++ httpd/mod_python/trunk/src/connobject.c Sat Nov 12 10:59:35 2005
@@ -292,12 +292,19 @@
 
 static PyObject *makeipaddr(struct apr_sockaddr_t *addr)
 {
-    long x = ntohl(addr->sa.sin.sin_addr.s_addr);
-    char buf[100];
-    sprintf(buf, "%d.%d.%d.%d",
-            (int) (x>>24) & 0xff, (int) (x>>16) & 0xff,
-            (int) (x>> 8) & 0xff, (int) (x>> 0) & 0xff);
-    return PyString_FromString(buf);
+    char *str = NULL;
+    apr_status_t rc;
+    PyObject *ret = NULL;
+
+    rc = apr_sockaddr_ip_get( &str, addr );
+    if (rc==APR_SUCCESS) {
+        ret = PyString_FromString( str );
+    }
+    else {
+        PyErr_SetString(PyExc_SystemError,"apr_sockaddr_ip_get failure");
+    }
+    
+    return ret; 
 }
 
 /**
@@ -311,7 +318,13 @@
     PyObject *addrobj = makeipaddr(addr);
     PyObject *ret = NULL;
     if (addrobj) {
-        ret = Py_BuildValue("Oi", addrobj, ntohs(addr->sa.sin.sin_port));
+        apr_port_t port;
+        if(apr_sockaddr_port_get(&port, addr)==APR_SUCCESS) {
+            ret = Py_BuildValue("Oi", addrobj, port );
+        }
+        else {
+            PyErr_SetString(PyExc_SystemError,"apr_sockaddr_port_get failure");
+        }
         Py_DECREF(addrobj);
     }
     return ret;