Merge branch 'master' of github.com:parrot/parrot

parrot · Jan 25, 2011 · 102e7e2 · 102e7e2
2 parents 7bbc1e7 + a29e645
commit 102e7e2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/include/parrot/platform_interface.h b/include/parrot/platform_interface.h
@@ -91,6 +91,8 @@ INTVAL Parrot_io_send(PARROT_INTERP, PIOHANDLE handle, ARGIN(const char *buf), s
 INTVAL Parrot_io_recv(PARROT_INTERP, PIOHANDLE handle, ARGOUT(char *buf), size_t len);
 INTVAL Parrot_io_poll(PARROT_INTERP, PIOHANDLE handle, int which, int sec, int usec);
 INTVAL Parrot_io_close_socket(PARROT_INTERP, PIOHANDLE handle);
+PMC *Parrot_io_remote_address(PARROT_INTERP, ARGIN(PMC *sock));
+PMC *Parrot_io_local_address(PARROT_INTERP, ARGIN(PMC *sock));
 
 /*
 ** Math:

diff --git a/src/io/socket_api.c b/src/io/socket_api.c
@@ -301,7 +301,7 @@ Parrot_io_connect_handle(PARROT_INTERP, ARGMOD(PMC *pmc), ARGMOD(PMC *address))
 
     /* Connect to an IPv6 addrinfo if an UnManagedStruct was provided as address */
     if (!PMC_IS_NULL(address) && address->vtable->base_type == enum_class_UnManagedStruct) {
-        res = VTABLE_get_pointer(interp, address);
+        res = (struct addrinfo *)VTABLE_get_pointer(interp, address);
 
         for (walk = res; walk != NULL; walk = walk->ai_next) {
             fd = socket(walk->ai_family, walk->ai_socktype, walk->ai_protocol);
@@ -382,7 +382,7 @@ Parrot_io_bind_handle(PARROT_INTERP, ARGMOD(PMC *pmc), ARGMOD(PMC *address))
 
     /* Bind to an IPv6 address (UnManagedStruct with an struct addrinfo inside */
     if (!PMC_IS_NULL(address) && address->vtable->base_type == enum_class_UnManagedStruct) {
-        res = VTABLE_get_pointer(interp, address);
+        res = (struct addrinfo *)VTABLE_get_pointer(interp, address);
 
         for (walk = res; walk != NULL; walk = walk->ai_next) {
             fd = socket(walk->ai_family, walk->ai_socktype, walk->ai_protocol);

diff --git a/src/platform/generic/socket.c b/src/platform/generic/socket.c
@@ -259,8 +259,8 @@ Parrot_io_listen(SHIM_INTERP, PIOHANDLE os_handle, INTVAL sec)
 
 /*
 
-=item C<PIOHANDLE Parrot_io_accept(PARROT_INTERP, PIOHANDLE os_handle, void
-*addr)>
+=item C<PIOHANDLE Parrot_io_accept(PARROT_INTERP, PIOHANDLE os_handle, PMC *
+remote_addr)>
 
 Accept a new connection and return a newly created C<ParrotIO> socket.
 

diff --git a/src/pmc/sockaddr.pmc b/src/pmc/sockaddr.pmc
@@ -137,7 +137,6 @@ Returns the string representation of this sockaddr by calling C<getnameinfo(3)>.
 */
     VTABLE STRING *get_string() {
         Parrot_Sockaddr_attributes * const data = PARROT_SOCKADDR(SELF);
-        struct sockaddr_storage *addr           = data->pointer;
         /* TODO: get hostname, not only numeric */
         char buf[INET6_ADDRSTRLEN+1];
         /* numeric port maximum is 65535, so 5 chars */
@@ -146,7 +145,7 @@ Returns the string representation of this sockaddr by calling C<getnameinfo(3)>.
         if (!data->pointer)
             return Parrot_sprintf_c(interp, "(?)");
 
-        getnameinfo((struct sockaddr_storage*)data->pointer, data->len, buf,
+        getnameinfo((struct sockaddr *)data->pointer, data->len, buf,
                 sizeof(buf), portbuf, sizeof(portbuf), NI_NUMERICHOST | NI_NUMERICSERV);
         return Parrot_str_format_data(interp, "%s:%s", buf, portbuf);
     }
@@ -166,7 +165,7 @@ Copies a C<sockaddr_in> or C<sockaddr_in6> from the given C<addrinfo> pointer
     VTABLE void set_pointer(void *value) {
         Parrot_Sockaddr_attributes * const data = PARROT_SOCKADDR(SELF);
 
-        struct addrinfo *walk = value;
+        struct addrinfo *walk = (struct addrinfo *)value;
         memcpy(data->pointer, walk->ai_addr, walk->ai_addrlen);
         data->len = walk->ai_addrlen;
     }