Changeset 76ca3f7 in mainline for uspace/srv/net/tl
- Timestamp:
- 2010-03-23T20:49:54Z (16 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- e417b96
- Parents:
- b48ebd19 (diff), 63f8966 (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. - Location:
- uspace/srv/net/tl
- Files:
-
- 6 edited
-
icmp/Makefile (modified) (2 diffs)
-
icmp/icmp.c (modified) (1 diff)
-
tcp/Makefile (modified) (2 diffs)
-
tcp/tcp.c (modified) (2 diffs)
-
udp/Makefile (modified) (2 diffs)
-
udp/udp.c (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/net/tl/icmp/Makefile
rb48ebd19 r76ca3f7 1 1 # 2 # Copyright (c) 2009 Lukas Mejdrech 2 # Copyright (c) 2005 Martin Decky 3 # Copyright (c) 2007 Jakub Jermar 3 4 # All rights reserved. 4 5 # … … 27 28 # 28 29 29 NAME = icmp 30 NET_BASE = ../.. 31 USPACE_PREFIX = ../../../.. 32 BINARY = icmp 30 33 31 NET_BASE = ../../ 32 STRUCTURES = $(NET_BASE)structures/ 34 SOURCES = \ 35 icmp.c \ 36 icmp_module.c \ 37 icmp_client.c \ 38 $(NET_BASE)/checksum.c \ 39 $(NET_BASE)/module.c \ 40 $(NET_BASE)/modules.c \ 41 $(NET_BASE)/il/ip/ip_client.c \ 42 $(NET_BASE)/il/ip/ip_remote.c \ 43 $(NET_BASE)/net/net_remote.c \ 44 $(NET_BASE)/structures/measured_strings.c \ 45 $(NET_BASE)/structures/packet/packet.c \ 46 $(NET_BASE)/structures/packet/packet_client.c \ 47 $(NET_BASE)/structures/packet/packet_remote.c 33 48 34 ## Sources 35 # 36 37 OUTPUT = $(NAME) 38 SOURCES = \ 39 $(NAME).c \ 40 $(NAME)_module.c \ 41 $(NAME)_client.c \ 42 $(NET_BASE)checksum.c \ 43 $(NET_BASE)module.c \ 44 $(NET_BASE)modules.c \ 45 $(NET_BASE)il/ip/ip_client.c \ 46 $(NET_BASE)il/ip/ip_remote.c \ 47 $(NET_BASE)net/net_remote.c \ 48 $(STRUCTURES)measured_strings.c \ 49 $(STRUCTURES)packet/packet.c \ 50 $(STRUCTURES)packet/packet_client.c \ 51 $(STRUCTURES)packet/packet_remote.c 52 53 include $(NET_BASE)Makefile.module 49 include $(USPACE_PREFIX)/Makefile.common -
uspace/srv/net/tl/icmp/icmp.c
rb48ebd19 r76ca3f7 41 41 #include <fibril_synch.h> 42 42 #include <stdint.h> 43 #include <str ing.h>43 #include <str.h> 44 44 45 45 #include <ipc/ipc.h> -
uspace/srv/net/tl/tcp/Makefile
rb48ebd19 r76ca3f7 1 1 # 2 # Copyright (c) 2009 Lukas Mejdrech 2 # Copyright (c) 2005 Martin Decky 3 # Copyright (c) 2007 Jakub Jermar 3 4 # All rights reserved. 4 5 # … … 27 28 # 28 29 29 NAME = tcp 30 NET_BASE = ../.. 31 USPACE_PREFIX = ../../../.. 32 BINARY = tcp 30 33 31 NET_BASE = ../../ 32 STRUCTURES = $(NET_BASE)structures/ 34 SOURCES = \ 35 tcp.c \ 36 tcp_module.c \ 37 $(NET_BASE)/checksum.c \ 38 $(NET_BASE)/module.c \ 39 $(NET_BASE)/modules.c \ 40 $(NET_BASE)/il/ip/ip_client.c \ 41 $(NET_BASE)/il/ip/ip_remote.c \ 42 $(NET_BASE)/net/net_remote.c \ 43 $(NET_BASE)/socket/socket_core.c \ 44 $(NET_BASE)/tl/icmp/icmp_client.c \ 45 $(NET_BASE)/tl/icmp/icmp_common.c \ 46 $(NET_BASE)/tl/icmp/icmp_remote.c \ 47 $(NET_BASE)/tl/tl_common.c \ 48 $(NET_BASE)/structures/char_map.c \ 49 $(NET_BASE)/structures/dynamic_fifo.c \ 50 $(NET_BASE)/structures/measured_strings.c \ 51 $(NET_BASE)/structures/packet/packet.c \ 52 $(NET_BASE)/structures/packet/packet_client.c \ 53 $(NET_BASE)/structures/packet/packet_remote.c 33 54 34 ## Sources 35 # 36 37 OUTPUT = $(NAME) 38 SOURCES = \ 39 $(NAME).c \ 40 $(NAME)_module.c \ 41 $(NET_BASE)checksum.c \ 42 $(NET_BASE)module.c \ 43 $(NET_BASE)modules.c \ 44 $(NET_BASE)il/ip/ip_client.c \ 45 $(NET_BASE)il/ip/ip_remote.c \ 46 $(NET_BASE)net/net_remote.c \ 47 $(NET_BASE)socket/socket_core.c \ 48 $(NET_BASE)tl/icmp/icmp_client.c \ 49 $(NET_BASE)tl/icmp/icmp_common.c \ 50 $(NET_BASE)tl/icmp/icmp_remote.c \ 51 $(NET_BASE)tl/tl_common.c \ 52 $(STRUCTURES)char_map.c \ 53 $(STRUCTURES)dynamic_fifo.c \ 54 $(STRUCTURES)measured_strings.c \ 55 $(STRUCTURES)packet/packet.c \ 56 $(STRUCTURES)packet/packet_client.c \ 57 $(STRUCTURES)packet/packet_remote.c 58 59 include $(NET_BASE)Makefile.module 55 include $(USPACE_PREFIX)/Makefile.common -
uspace/srv/net/tl/tcp/tcp.c
rb48ebd19 r76ca3f7 1060 1060 int app_phone = IPC_GET_PHONE(&call); 1061 1061 struct sockaddr * addr; 1062 int socket_id; 1062 1063 size_t addrlen; 1063 1064 fibril_rwlock_t lock; … … 1104 1105 socket_data->local_sockets = &local_sockets; 1105 1106 fibril_rwlock_write_lock(&lock); 1106 *SOCKET_SET_SOCKET_ID(answer) = SOCKET_GET_SOCKET_ID(call); 1107 res = socket_create(&local_sockets, app_phone, socket_data, SOCKET_SET_SOCKET_ID(answer)); 1107 socket_id = SOCKET_GET_SOCKET_ID(call); 1108 res = socket_create(&local_sockets, app_phone, socket_data, &socket_id); 1109 *SOCKET_SET_SOCKET_ID(answer) = socket_id; 1108 1110 fibril_rwlock_write_unlock(&lock); 1109 1111 if(res == EOK){ -
uspace/srv/net/tl/udp/Makefile
rb48ebd19 r76ca3f7 1 1 # 2 # Copyright (c) 2009 Lukas Mejdrech 2 # Copyright (c) 2005 Martin Decky 3 # Copyright (c) 2007 Jakub Jermar 3 4 # All rights reserved. 4 5 # … … 27 28 # 28 29 29 NAME = udp 30 NET_BASE = ../.. 31 USPACE_PREFIX = ../../../.. 32 BINARY = udp 30 33 31 NET_BASE = ../../ 32 STRUCTURES = $(NET_BASE)structures/ 34 SOURCES = \ 35 udp.c \ 36 udp_module.c \ 37 $(NET_BASE)/checksum.c \ 38 $(NET_BASE)/module.c \ 39 $(NET_BASE)/modules.c \ 40 $(NET_BASE)/il/ip/ip_client.c \ 41 $(NET_BASE)/il/ip/ip_remote.c \ 42 $(NET_BASE)/net/net_remote.c \ 43 $(NET_BASE)/socket/socket_core.c \ 44 $(NET_BASE)/tl/icmp/icmp_client.c \ 45 $(NET_BASE)/tl/icmp/icmp_common.c \ 46 $(NET_BASE)/tl/icmp/icmp_remote.c \ 47 $(NET_BASE)/tl/tl_common.c \ 48 $(NET_BASE)/structures/char_map.c \ 49 $(NET_BASE)/structures/dynamic_fifo.c \ 50 $(NET_BASE)/structures/measured_strings.c \ 51 $(NET_BASE)/structures/packet/packet.c \ 52 $(NET_BASE)/structures/packet/packet_client.c \ 53 $(NET_BASE)/structures/packet/packet_remote.c 33 54 34 ## Sources 35 # 36 37 OUTPUT = $(NAME) 38 SOURCES = \ 39 $(NAME).c \ 40 $(NAME)_module.c \ 41 $(NET_BASE)checksum.c \ 42 $(NET_BASE)module.c \ 43 $(NET_BASE)modules.c \ 44 $(NET_BASE)il/ip/ip_client.c \ 45 $(NET_BASE)il/ip/ip_remote.c \ 46 $(NET_BASE)net/net_remote.c \ 47 $(NET_BASE)socket/socket_core.c \ 48 $(NET_BASE)tl/icmp/icmp_client.c \ 49 $(NET_BASE)tl/icmp/icmp_common.c \ 50 $(NET_BASE)tl/icmp/icmp_remote.c \ 51 $(NET_BASE)tl/tl_common.c \ 52 $(STRUCTURES)char_map.c \ 53 $(STRUCTURES)dynamic_fifo.c \ 54 $(STRUCTURES)measured_strings.c \ 55 $(STRUCTURES)packet/packet.c \ 56 $(STRUCTURES)packet/packet_client.c \ 57 $(STRUCTURES)packet/packet_remote.c 58 59 include $(NET_BASE)Makefile.module 55 include $(USPACE_PREFIX)/Makefile.common -
uspace/srv/net/tl/udp/udp.c
rb48ebd19 r76ca3f7 417 417 int app_phone = IPC_GET_PHONE(&call); 418 418 struct sockaddr * addr; 419 int socket_id; 419 420 size_t addrlen; 420 421 ipc_call_t answer; … … 451 452 break; 452 453 case NET_SOCKET: 453 *SOCKET_SET_SOCKET_ID(answer) = SOCKET_GET_SOCKET_ID(call); 454 res = socket_create(&local_sockets, app_phone, NULL, SOCKET_SET_SOCKET_ID(answer)); 454 socket_id = SOCKET_GET_SOCKET_ID(call); 455 res = socket_create(&local_sockets, app_phone, NULL, &socket_id); 456 *SOCKET_SET_SOCKET_ID(answer) = socket_id; 457 455 458 if(res == EOK){ 456 459 if(tl_get_ip_packet_dimension(udp_globals.ip_phone, &udp_globals.dimensions, DEVICE_INVALID_ID, &packet_dimension) == EOK){
Note:
See TracChangeset
for help on using the changeset viewer.
