Changeset dd0c8a0 in mainline for uspace/lib/c/generic/net/socket_client.c

Timestamp:

2013-09-29T06:56:33Z (12 years ago)

Author:

Beniamino Galvani <b.galvani@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a9bd960d

Parents:

3deb0155 (diff), 13be2583 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/lib/c/generic/net/socket_client.c (modified) (6 diffs)

uspace/lib/c/generic/net/socket_client.c

@@ -87 +87 @@
         /** Parent module service. */
         services_t service;
+        /** Socket family */
+        int family;
 
         /**
@@ -395 +397 @@
         switch (domain) {
         case PF_INET:
+        case PF_INET6:
                 switch (type) {
                 case SOCK_STREAM:
@@ -433 +436 @@
                 break;
 
-        case PF_INET6:
         default:
                 return EPFNOSUPPORT;
@@ -446 +448 @@
                 return ENOMEM;
 
-        bzero(socket, sizeof(*socket));
+        memset(socket, 0, sizeof(*socket));
+        socket->family = domain;
         fibril_rwlock_write_lock(&socket_globals.lock);
 
@@ -657 +660 @@
                 return ENOMEM;
         }
-        bzero(new_socket, sizeof(*new_socket));
+        memset(new_socket, 0, sizeof(*new_socket));
         socket_id = socket_generate_new_id();
         if (socket_id <= 0) {
@@ -920 +923 @@
  *                      message.
  */
-int send(int socket_id, void *data, size_t datalength, int flags)
+int send(int socket_id, const void *data, size_t datalength, int flags)
 {
         /* Without the address */