Changes in uspace/srv/net/tl/udp/udp.c [46d4d9f:ffa2c8ef] in mainline
- File:
-
- 1 edited
-
uspace/srv/net/tl/udp/udp.c (modified) (15 diffs)
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/net/tl/udp/udp.c
r46d4d9f rffa2c8ef 36 36 */ 37 37 38 #include "udp.h"39 #include "udp_header.h"40 #include "udp_module.h"41 42 38 #include <async.h> 43 39 #include <fibril_synch.h> 44 40 #include <malloc.h> 45 41 #include <stdio.h> 46 #include <ipc/ipc.h>47 42 #include <ipc/services.h> 48 43 #include <ipc/net.h> … … 65 60 #include <ip_interface.h> 66 61 #include <icmp_client.h> 67 #include <icmp_ interface.h>62 #include <icmp_remote.h> 68 63 #include <net_interface.h> 69 64 #include <socket_core.h> 70 65 #include <tl_common.h> 71 #include <tl_local.h> 72 #include <tl_interface.h> 66 #include <tl_remote.h> 67 #include <tl_skel.h> 68 69 #include "udp.h" 70 #include "udp_header.h" 73 71 74 72 /** UDP module name. */ 75 #define NAME "UDP protocol"73 #define NAME "udp" 76 74 77 75 /** Default UDP checksum computing. */ … … 92 90 /** UDP global data. */ 93 91 udp_globals_t udp_globals; 94 95 /** Initializes the UDP module.96 *97 * @param[in] client_connection The client connection processing function. The98 * module skeleton propagates its own one.99 * @return EOK on success.100 * @return ENOMEM if there is not enough memory left.101 */102 int udp_initialize(async_client_conn_t client_connection)103 {104 measured_string_t names[] = {105 {106 (char *) "UDP_CHECKSUM_COMPUTING",107 22108 },109 {110 (char *) "UDP_AUTOBINDING",111 15112 }113 };114 measured_string_t *configuration;115 size_t count = sizeof(names) / sizeof(measured_string_t);116 char *data;117 int rc;118 119 fibril_rwlock_initialize(&udp_globals.lock);120 fibril_rwlock_write_lock(&udp_globals.lock);121 122 udp_globals.icmp_phone = icmp_connect_module(SERVICE_ICMP,123 ICMP_CONNECT_TIMEOUT);124 125 udp_globals.ip_phone = ip_bind_service(SERVICE_IP, IPPROTO_UDP,126 SERVICE_UDP, client_connection);127 if (udp_globals.ip_phone < 0) {128 fibril_rwlock_write_unlock(&udp_globals.lock);129 return udp_globals.ip_phone;130 }131 132 /* Read default packet dimensions */133 rc = ip_packet_size_req(udp_globals.ip_phone, -1,134 &udp_globals.packet_dimension);135 if (rc != EOK) {136 fibril_rwlock_write_unlock(&udp_globals.lock);137 return rc;138 }139 140 rc = socket_ports_initialize(&udp_globals.sockets);141 if (rc != EOK) {142 fibril_rwlock_write_unlock(&udp_globals.lock);143 return rc;144 }145 146 rc = packet_dimensions_initialize(&udp_globals.dimensions);147 if (rc != EOK) {148 socket_ports_destroy(&udp_globals.sockets);149 fibril_rwlock_write_unlock(&udp_globals.lock);150 return rc;151 }152 153 udp_globals.packet_dimension.prefix += sizeof(udp_header_t);154 udp_globals.packet_dimension.content -= sizeof(udp_header_t);155 udp_globals.last_used_port = UDP_FREE_PORTS_START - 1;156 157 udp_globals.checksum_computing = NET_DEFAULT_UDP_CHECKSUM_COMPUTING;158 udp_globals.autobinding = NET_DEFAULT_UDP_AUTOBINDING;159 160 /* Get configuration */161 configuration = &names[0];162 rc = net_get_conf_req(udp_globals.net_phone, &configuration, count,163 &data);164 if (rc != EOK) {165 socket_ports_destroy(&udp_globals.sockets);166 fibril_rwlock_write_unlock(&udp_globals.lock);167 return rc;168 }169 170 if (configuration) {171 if (configuration[0].value)172 udp_globals.checksum_computing =173 (configuration[0].value[0] == 'y');174 175 if (configuration[1].value)176 udp_globals.autobinding =177 (configuration[1].value[0] == 'y');178 179 net_free_settings(configuration, data);180 }181 182 fibril_rwlock_write_unlock(&udp_globals.lock);183 return EOK;184 }185 92 186 93 /** Releases the packet and returns the result. … … 283 190 /* Find the destination socket */ 284 191 socket = socket_port_find(&udp_globals.sockets, 285 ntohs(header->destination_port),SOCKET_MAP_KEY_LISTENING, 0);192 ntohs(header->destination_port), (uint8_t *) SOCKET_MAP_KEY_LISTENING, 0); 286 193 if (!socket) { 287 194 if (tl_prepare_icmp_packet(udp_globals.net_phone, … … 393 300 fibril_rwlock_write_unlock(&udp_globals.lock); 394 301 async_msg_5(socket->phone, NET_SOCKET_RECEIVED, 395 ( ipcarg_t) socket->socket_id, packet_dimension->content, 0, 0,396 ( ipcarg_t) fragments);302 (sysarg_t) socket->socket_id, packet_dimension->content, 0, 0, 303 (sysarg_t) fragments); 397 304 398 305 return EOK; … … 424 331 425 332 return result; 333 } 334 335 /** Process IPC messages from the IP module 336 * 337 * @param[in] iid Message identifier. 338 * @param[in,out] icall Message parameters. 339 * 340 */ 341 static void udp_receiver(ipc_callid_t iid, ipc_call_t *icall) 342 { 343 packet_t *packet; 344 int rc; 345 346 while (true) { 347 switch (IPC_GET_IMETHOD(*icall)) { 348 case NET_TL_RECEIVED: 349 rc = packet_translate_remote(udp_globals.net_phone, &packet, 350 IPC_GET_PACKET(*icall)); 351 if (rc == EOK) 352 rc = udp_received_msg(IPC_GET_DEVICE(*icall), packet, 353 SERVICE_UDP, IPC_GET_ERROR(*icall)); 354 355 async_answer_0(iid, (sysarg_t) rc); 356 break; 357 default: 358 async_answer_0(iid, (sysarg_t) ENOTSUP); 359 } 360 361 iid = async_get_call(icall); 362 } 363 } 364 365 /** Initialize the UDP module. 366 * 367 * @param[in] net_phone Network module phone. 368 * 369 * @return EOK on success. 370 * @return ENOMEM if there is not enough memory left. 371 * 372 */ 373 int tl_initialize(int net_phone) 374 { 375 measured_string_t names[] = { 376 { 377 (uint8_t *) "UDP_CHECKSUM_COMPUTING", 378 22 379 }, 380 { 381 (uint8_t *) "UDP_AUTOBINDING", 382 15 383 } 384 }; 385 measured_string_t *configuration; 386 size_t count = sizeof(names) / sizeof(measured_string_t); 387 uint8_t *data; 388 389 fibril_rwlock_initialize(&udp_globals.lock); 390 fibril_rwlock_write_lock(&udp_globals.lock); 391 392 udp_globals.net_phone = net_phone; 393 394 udp_globals.icmp_phone = icmp_connect_module(ICMP_CONNECT_TIMEOUT); 395 396 udp_globals.ip_phone = ip_bind_service(SERVICE_IP, IPPROTO_UDP, 397 SERVICE_UDP, udp_receiver); 398 if (udp_globals.ip_phone < 0) { 399 fibril_rwlock_write_unlock(&udp_globals.lock); 400 return udp_globals.ip_phone; 401 } 402 403 /* Read default packet dimensions */ 404 int rc = ip_packet_size_req(udp_globals.ip_phone, -1, 405 &udp_globals.packet_dimension); 406 if (rc != EOK) { 407 fibril_rwlock_write_unlock(&udp_globals.lock); 408 return rc; 409 } 410 411 rc = socket_ports_initialize(&udp_globals.sockets); 412 if (rc != EOK) { 413 fibril_rwlock_write_unlock(&udp_globals.lock); 414 return rc; 415 } 416 417 rc = packet_dimensions_initialize(&udp_globals.dimensions); 418 if (rc != EOK) { 419 socket_ports_destroy(&udp_globals.sockets); 420 fibril_rwlock_write_unlock(&udp_globals.lock); 421 return rc; 422 } 423 424 udp_globals.packet_dimension.prefix += sizeof(udp_header_t); 425 udp_globals.packet_dimension.content -= sizeof(udp_header_t); 426 udp_globals.last_used_port = UDP_FREE_PORTS_START - 1; 427 428 udp_globals.checksum_computing = NET_DEFAULT_UDP_CHECKSUM_COMPUTING; 429 udp_globals.autobinding = NET_DEFAULT_UDP_AUTOBINDING; 430 431 /* Get configuration */ 432 configuration = &names[0]; 433 rc = net_get_conf_req(udp_globals.net_phone, &configuration, count, 434 &data); 435 if (rc != EOK) { 436 socket_ports_destroy(&udp_globals.sockets); 437 fibril_rwlock_write_unlock(&udp_globals.lock); 438 return rc; 439 } 440 441 if (configuration) { 442 if (configuration[0].value) 443 udp_globals.checksum_computing = 444 (configuration[0].value[0] == 'y'); 445 446 if (configuration[1].value) 447 udp_globals.autobinding = 448 (configuration[1].value[0] == 'y'); 449 450 net_free_settings(configuration, data); 451 } 452 453 fibril_rwlock_write_unlock(&udp_globals.lock); 454 return EOK; 426 455 } 427 456 … … 707 736 bool keep_on_going = true; 708 737 socket_cores_t local_sockets; 709 int app_phone = IPC_GET_PHONE( &call);738 int app_phone = IPC_GET_PHONE(call); 710 739 struct sockaddr *addr; 711 740 int socket_id; … … 713 742 size_t size; 714 743 ipc_call_t answer; 715 int answer_count;744 size_t answer_count; 716 745 packet_dimension_t *packet_dimension; 717 746 … … 742 771 743 772 /* Process the call */ 744 switch (IPC_GET_ METHOD(call)) {773 switch (IPC_GET_IMETHOD(call)) { 745 774 case IPC_M_PHONE_HUNGUP: 746 775 keep_on_going = false; … … 771 800 772 801 case NET_SOCKET_BIND: 773 res = data_receive((void **) &addr, &addrlen); 802 res = async_data_write_accept((void **) &addr, false, 803 0, 0, 0, &addrlen); 774 804 if (res != EOK) 775 805 break; … … 784 814 785 815 case NET_SOCKET_SENDTO: 786 res = data_receive((void **) &addr, &addrlen); 816 res = async_data_write_accept((void **) &addr, false, 817 0, 0, 0, &addrlen); 787 818 if (res != EOK) 788 819 break; … … 836 867 837 868 /* Release the application phone */ 838 ipc_hangup(app_phone);869 async_hangup(app_phone); 839 870 840 871 /* Release all local sockets */ … … 843 874 844 875 return res; 876 } 877 878 /** Per-connection initialization 879 * 880 */ 881 void tl_connection(void) 882 { 845 883 } 846 884 … … 858 896 * @see IS_NET_UDP_MESSAGE() 859 897 */ 860 int udp_message_standalone(ipc_callid_t callid, ipc_call_t *call, 861 ipc_call_t *answer, int *answer_count) 862 { 863 packet_t *packet; 864 int rc; 865 898 int tl_message(ipc_callid_t callid, ipc_call_t *call, 899 ipc_call_t *answer, size_t *answer_count) 900 { 866 901 *answer_count = 0; 867 902 868 switch (IPC_GET_METHOD(*call)) { 869 case NET_TL_RECEIVED: 870 rc = packet_translate_remote(udp_globals.net_phone, &packet, 871 IPC_GET_PACKET(call)); 872 if (rc != EOK) 873 return rc; 874 return udp_received_msg(IPC_GET_DEVICE(call), packet, 875 SERVICE_UDP, IPC_GET_ERROR(call)); 903 switch (IPC_GET_IMETHOD(*call)) { 876 904 case IPC_M_CONNECT_TO_ME: 877 return udp_process_client_messages(callid, * 905 return udp_process_client_messages(callid, *call); 878 906 } 879 907 … … 881 909 } 882 910 883 /** Default thread for new connections.884 *885 * @param[in] iid The initial message identifier.886 * @param[in] icall The initial message call structure.887 */888 static void tl_client_connection(ipc_callid_t iid, ipc_call_t * icall)889 {890 /*891 * Accept the connection892 * - Answer the first IPC_M_CONNECT_ME_TO call.893 */894 ipc_answer_0(iid, EOK);895 896 while (true) {897 ipc_call_t answer;898 int answer_count;899 900 /* Clear the answer structure */901 refresh_answer(&answer, &answer_count);902 903 /* Fetch the next message */904 ipc_call_t call;905 ipc_callid_t callid = async_get_call(&call);906 907 /* Process the message */908 int res = tl_module_message_standalone(callid, &call, &answer,909 &answer_count);910 911 /*912 * End if told to either by the message or the processing913 * result.914 */915 if ((IPC_GET_METHOD(call) == IPC_M_PHONE_HUNGUP) ||916 (res == EHANGUP))917 return;918 919 /* Answer the message */920 answer_call(callid, res, &answer, answer_count);921 }922 }923 924 /** Starts the module.925 *926 * @return EOK on success.927 * @return Other error codes as defined for each specific module928 * start function.929 */930 911 int main(int argc, char *argv[]) 931 912 { 932 int rc;933 934 913 /* Start the module */ 935 rc = tl_module_start_standalone(tl_client_connection); 936 return rc; 914 return tl_module_start(SERVICE_UDP); 937 915 } 938 916
Note:
See TracChangeset
for help on using the changeset viewer.
