Changeset f1fae414 in mainline for uspace/lib/c/generic/net/socket_client.c
- Timestamp:
- 2011-06-22T01:34:53Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 8d7e82c1, cac458f
- Parents:
- 72ec8cc (diff), bf172825 (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/c/generic/net/socket_client.c
r72ec8cc rf1fae414 65 65 #define SOCKET_MAX_ACCEPTED_SIZE 0 66 66 67 /** Default timeout for connections in microseconds. */68 #define SOCKET_CONNECT_TIMEOUT (1 * 1000 * 1000)69 70 67 /** 71 68 * Maximum number of random attempts to find a new socket identifier before … … 203 200 * @param[in] iid The initial message identifier. 204 201 * @param[in] icall The initial message call structure. 205 */ 206 static void socket_connection(ipc_callid_t iid, ipc_call_t * icall) 202 * @param[in] arg Local argument. 203 */ 204 static void socket_connection(ipc_callid_t iid, ipc_call_t * icall, void *arg) 207 205 { 208 206 ipc_callid_t callid; … … 288 286 * @return The TCP module phone. 289 287 * @return Other error codes as defined for the 290 * bind_service _timeout() function.288 * bind_service() function. 291 289 */ 292 290 static int socket_get_tcp_phone(void) 293 291 { 294 292 if (socket_globals.tcp_phone < 0) { 295 socket_globals.tcp_phone = bind_service_timeout(SERVICE_TCP, 296 0, 0, SERVICE_TCP, socket_connection, 297 SOCKET_CONNECT_TIMEOUT); 293 socket_globals.tcp_phone = bind_service(SERVICE_TCP, 294 0, 0, SERVICE_TCP, socket_connection); 298 295 } 299 296 … … 307 304 * @return The UDP module phone. 308 305 * @return Other error codes as defined for the 309 * bind_service _timeout() function.306 * bind_service() function. 310 307 */ 311 308 static int socket_get_udp_phone(void) 312 309 { 313 310 if (socket_globals.udp_phone < 0) { 314 socket_globals.udp_phone = bind_service_timeout(SERVICE_UDP, 315 0, 0, SERVICE_UDP, socket_connection, 316 SOCKET_CONNECT_TIMEOUT); 311 socket_globals.udp_phone = bind_service(SERVICE_UDP, 312 0, 0, SERVICE_UDP, socket_connection); 317 313 } 318 314 … … 396 392 * @return Other error codes as defined for the NET_SOCKET message. 397 393 * @return Other error codes as defined for the 398 * bind_service _timeout() function.394 * bind_service() function. 399 395 */ 400 396 int socket(int domain, int type, int protocol)
Note:
See TracChangeset
for help on using the changeset viewer.