Changeset 5d2e976 in mainline

Timestamp:

2010-03-15T19:43:12Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6e81d04

Parents:

4684368 (diff), 6092b56e (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 networking fix.

Location:

uspace/srv/net

Files:

• socket/socket_messages.h (modified) (3 diffs)
• tl/tcp/tcp.c (modified) (2 diffs)
• tl/udp/udp.c (modified) (2 diffs)

uspace/srv/net/socket/socket_messages.h

@@ -115 +115 @@
  *  @param[out] answer The message answer structure.
  */
-#define SOCKET_SET_SOCKET_ID(answer)                    (int *) &IPC_GET_ARG1(answer)
+#define SOCKET_SET_SOCKET_ID(answer)            &IPC_GET_ARG1(answer)
 
 /** Returns the socket identifier message parameter.
  *  @param[in] call The message call structure.
  */
-#define SOCKET_GET_SOCKET_ID(call)                      (int) IPC_GET_ARG1(call)
+#define SOCKET_GET_SOCKET_ID(call)              (int) IPC_GET_ARG1(call)
 
 /** Sets the read data length in the message answer.
  *  @param[out] answer The message answer structure.
  */
-#define SOCKET_SET_READ_DATA_LENGTH(answer)     (int *) &IPC_GET_ARG1(answer)
+#define SOCKET_SET_READ_DATA_LENGTH(answer)     &IPC_GET_ARG1(answer)
 
 /** Returns the read data length message parameter.
  *  @param[in] call The message call structure.
  */
-#define SOCKET_GET_READ_DATA_LENGTH(call)               (int) IPC_GET_ARG1(call)
+#define SOCKET_GET_READ_DATA_LENGTH(call)       (int) IPC_GET_ARG1(call)
 
 /** Returns the backlog message parameter.
  *  @param[in] call The message call structure.
  */
-#define SOCKET_GET_BACKLOG(call)                                (int) IPC_GET_ARG2(call)
+#define SOCKET_GET_BACKLOG(call)                (int) IPC_GET_ARG2(call)
 
 /** Returns the option level message parameter.
  *  @param[in] call The message call structure.
  */
-#define SOCKET_GET_OPT_LEVEL(call)                      (int) IPC_GET_ARG2(call)
+#define SOCKET_GET_OPT_LEVEL(call)              (int) IPC_GET_ARG2(call)
 
 /** Returns the data fragment size message parameter.
@@ -150 +150 @@
  *  @param[out] answer The message answer structure.
  */
-#define SOCKET_SET_DATA_FRAGMENT_SIZE(answer)   (size_t *) &IPC_GET_ARG2(answer)
+#define SOCKET_SET_DATA_FRAGMENT_SIZE(answer)   &IPC_GET_ARG2(answer)
 
 /** Sets the address length in the message answer.
  *  @param[out] answer The message answer structure.
  */
-#define SOCKET_SET_ADDRESS_LENGTH(answer)               (socklen_t *) &IPC_GET_ARG3(answer)
+#define SOCKET_SET_ADDRESS_LENGTH(answer)       &IPC_GET_ARG3(answer)
 
 /** Returns the address length message parameter.
@@ -165 +165 @@
  *  @param[out] answer The message answer structure.
  */
-#define SOCKET_SET_HEADER_SIZE(answer)          (int *) &IPC_GET_ARG3(answer)
+#define SOCKET_SET_HEADER_SIZE(answer)          &IPC_GET_ARG3(answer)
 
 /** Returns the header size message parameter.
  *  @param[in] call The message call structure.
  */
-#define SOCKET_GET_HEADER_SIZE(call)                    (int) IPC_GET_ARG3(call)
+#define SOCKET_GET_HEADER_SIZE(call)            (size_t) IPC_GET_ARG3(call)
 
 /** Returns the flags message parameter.
  *  @param[in] call The message call structure.
  */
-#define SOCKET_GET_FLAGS(call)                          (int) IPC_GET_ARG4(call)
+#define SOCKET_GET_FLAGS(call)                  (int) IPC_GET_ARG4(call)
 
 /** Returns the option name message parameter.
  *  @param[in] call The message call structure.
  */
-#define SOCKET_GET_OPT_NAME(call)                               (int) IPC_GET_ARG4(call)
+#define SOCKET_GET_OPT_NAME(call)               (int) IPC_GET_ARG4(call)
 
 /** Returns the data fragments message parameter.

uspace/srv/net/tl/tcp/tcp.c

@@ -1060 +1060 @@
         int app_phone = IPC_GET_PHONE(&call);
         struct sockaddr * addr;
+        int socket_id;
         size_t addrlen;
         fibril_rwlock_t lock;
@@ -1104 +1105 @@
                                         socket_data->local_sockets = &local_sockets;
                                         fibril_rwlock_write_lock(&lock);
-                                        *SOCKET_SET_SOCKET_ID(answer) = SOCKET_GET_SOCKET_ID(call);
-                                        res = socket_create(&local_sockets, app_phone, socket_data, SOCKET_SET_SOCKET_ID(answer));
+                                        socket_id = SOCKET_GET_SOCKET_ID(call);
+                                        res = socket_create(&local_sockets, app_phone, socket_data, &socket_id);
+                                        *SOCKET_SET_SOCKET_ID(answer) = socket_id;
                                         fibril_rwlock_write_unlock(&lock);
                                         if(res == EOK){

uspace/srv/net/tl/udp/udp.c

@@ -417 +417 @@
         int app_phone = IPC_GET_PHONE(&call);
         struct sockaddr * addr;
+        int socket_id;
         size_t addrlen;
         ipc_call_t answer;
@@ -451 +452 @@
                                 break;
                         case NET_SOCKET:
-                                *SOCKET_SET_SOCKET_ID(answer) = SOCKET_GET_SOCKET_ID(call);
-                                res = socket_create(&local_sockets, app_phone, NULL, SOCKET_SET_SOCKET_ID(answer));
+                                socket_id = SOCKET_GET_SOCKET_ID(call);
+                                res = socket_create(&local_sockets, app_phone, NULL, &socket_id);
+                                *SOCKET_SET_SOCKET_ID(answer) = socket_id;
+                                
                                 if(res == EOK){
                                         if(tl_get_ip_packet_dimension(udp_globals.ip_phone, &udp_globals.dimensions, DEVICE_INVALID_ID, &packet_dimension) == EOK){