Changes in uspace/lib/net/il/ip_remote.c [46d4d9f:14f1db0] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/net/il/ip_remote.c
r46d4d9f r14f1db0 27 27 */ 28 28 29 /** @addtogroup libnet29 /** @addtogroup ip 30 30 * @{ 31 31 */ … … 40 40 */ 41 41 42 #include <ipc/services.h> 43 44 #include <net_messages.h> 45 #include <net_modules.h> 46 #include <net_device.h> 47 #include <inet.h> 48 #include <ip_interface.h> 49 #include <packet/packet_client.h> 50 #include <il_messages.h> 51 #include <ip_messages.h> 42 52 #include <ip_remote.h> 43 #include <ip_interface.h>44 #include <packet_client.h>45 #include <generic.h>46 47 #include <ipc/services.h>48 #include <ipc/il.h>49 #include <ipc/ip.h>50 51 #include <net/modules.h>52 #include <net/device.h>53 #include <net/inet.h>54 53 55 54 /** Add a route to the device routing table. … … 57 56 * The target network is routed using this device. 58 57 * 59 * @param[in] ip_phone The IP module phone used for (semi)remote calls. 60 * @param[in] device_id The device identifier. 61 * @param[in] address The target network address. 62 * @param[in] netmask The target network mask. 63 * @param[in] gateway The target network gateway. Not used if zero. 58 * @param[in] ip_phone The IP module phone used for (semi)remote calls. 59 * @param[in] device_id The device identifier. 60 * @param[in] address The target network address. 61 * @param[in] netmask The target network mask. 62 * @param[in] gateway The target network gateway. Not used if zero. 63 * 64 64 */ 65 65 int ip_add_route_req_remote(int ip_phone, device_id_t device_id, … … 71 71 } 72 72 73 /** Creates bidirectional connection with the ip module service and registers74 * the message receiver.75 *76 * @param[in] service The IP module service.77 * @param[in] protocol The transport layer protocol.78 * @param[in] me The requesting module service.79 * @param[in] receiver The message receiver. Used for remote connection.80 * @return The phone of the needed service.81 * @return EOK on success.82 * @return Other error codes as defined for the bind_service()83 * function.84 */85 73 int ip_bind_service(services_t service, int protocol, services_t me, 86 async_client_conn_t receiver )74 async_client_conn_t receiver, tl_received_msg_t tl_received_msg) 87 75 { 88 76 return (int) bind_service(service, (ipcarg_t) protocol, me, service, … … 90 78 } 91 79 92 /** Connects to the IP module.93 *94 * @param service The IP module service. Ignored parameter.95 * @return The IP module phone on success.96 */97 80 int ip_connect_module(services_t service) 98 81 { … … 105 88 * If the device uses ARP registers also the new ARP device. 106 89 * 107 * @param[in] ip_phone The IP module phone used for (semi)remote calls. 108 * @param[in] device_id The new device identifier. 109 * @param[in] netif The underlying device network interface layer service. 110 * @return EOK on success. 111 * @return ENOMEM if there is not enough memory left. 112 * @return EINVAL if the device configuration is invalid. 113 * @return ENOTSUP if the device uses IPv6. 114 * @return ENOTSUP if the device uses DHCP. 115 * @return Other error codes as defined for the 116 * net_get_device_conf_req() function. 117 * @return Other error codes as defined for the arp_device_req() 118 * function. 90 * @param[in] ip_phone The IP module phone used for (semi)remote calls. 91 * @param[in] device_id The new device identifier. 92 * @param[in] netif The underlying device network interface layer service. 93 * 94 * @return EOK on success. 95 * @return ENOMEM if there is not enough memory left. 96 * @return EINVAL if the device configuration is invalid. 97 * @return ENOTSUP if the device uses IPv6. 98 * @return ENOTSUP if the device uses DHCP. 99 * @return Other error codes as defined for the net_get_device_conf_req() 100 * function. 101 * @return Other error codes as defined for the arp_device_req() function. 102 * 119 103 */ 120 104 int ip_device_req_remote(int ip_phone, device_id_t device_id, … … 125 109 } 126 110 127 /** Return the device identifier and the IP pseudo header based on the 128 * destination address. 129 * 130 * @param[in] ip_phone The IP module phone used for (semi)remote calls. 131 * @param[in] protocol The transport protocol. 132 * @param[in] destination The destination address. 133 * @param[in] addrlen The destination address length. 134 * @param[out] device_id The device identifier. 135 * @param[out] header The constructed IP pseudo header. 136 * @param[out] headerlen The IP pseudo header length. 111 /** Return the device identifier and the IP pseudo header based on the destination address. 112 * 113 * @param[in] ip_phone The IP module phone used for (semi)remote calls. 114 * @param[in] protocol The transport protocol. 115 * @param[in] destination The destination address. 116 * @param[in] addrlen The destination address length. 117 * @param[out] device_id The device identifier. 118 * @param[out] header The constructed IP pseudo header. 119 * @param[out] headerlen The IP pseudo header length. 137 120 * 138 121 */ … … 141 124 device_id_t *device_id, void **header, size_t *headerlen) 142 125 { 143 if ( !destination|| (addrlen == 0))126 if ((!destination) || (addrlen == 0)) 144 127 return EINVAL; 145 128 146 if ( !device_id || !header || !headerlen)129 if ((!device_id) || (header) || (headerlen)) 147 130 return EBADMEM; 148 131 … … 153 136 (ipcarg_t) protocol, &answer); 154 137 155 if ((async_data_write_start(ip_phone, destination, addrlen) == EOK) &&156 (async_data_read_start(ip_phone, headerlen,157 sizeof(*headerlen)) == EOK)&& (*headerlen > 0)) {138 if ((async_data_write_start(ip_phone, destination, addrlen) == EOK) 139 && (async_data_read_start(ip_phone, headerlen, sizeof(*headerlen)) == EOK) 140 && (*headerlen > 0)) { 158 141 *header = malloc(*headerlen); 159 142 if (*header) { 160 if (async_data_read_start(ip_phone, *header, 161 *headerlen) != EOK) 143 if (async_data_read_start(ip_phone, *header, *headerlen) != EOK) 162 144 free(*header); 163 145 } … … 167 149 async_wait_for(message_id, &result); 168 150 169 if ((result != EOK) && *header)151 if ((result != EOK) && (*header)) 170 152 free(*header); 171 153 else … … 177 159 /** Return the device packet dimension for sending. 178 160 * 179 * @param[in] ip_phoneThe IP module phone used for (semi)remote calls.180 * @param[in] device_idThe device identifier.161 * @param[in] ip_phone The IP module phone used for (semi)remote calls. 162 * @param[in] device_id The device identifier. 181 163 * @param[out] packet_dimension The packet dimension. 182 * @return EOK on success. 183 * @return ENOENT if there is no such device. 184 * @return Other error codes as defined for the 185 * generic_packet_size_req_remote() function. 164 * 165 * @return EOK on success. 166 * @return ENOENT if there is no such device. 167 * @return Other error codes as defined for the 168 * generic_packet_size_req_remote() function. 169 * 186 170 */ 187 171 int ip_packet_size_req_remote(int ip_phone, device_id_t device_id, 188 packet_dimension_ t *packet_dimension)189 { 190 return generic_packet_size_req_remote(ip_phone, NET_IL_PACKET_SPACE, 191 device_id,packet_dimension);172 packet_dimension_ref packet_dimension) 173 { 174 return generic_packet_size_req_remote(ip_phone, NET_IL_PACKET_SPACE, device_id, 175 packet_dimension); 192 176 } 193 177 194 178 /** Notify the IP module about the received error notification packet. 195 179 * 196 * @param[in] ip_phone The IP module phone used for (semi)remote calls. 197 * @param[in] device_id The device identifier. 198 * @param[in] packet The received packet or the received packet queue. 199 * @param[in] target The target internetwork module service to be 200 * delivered to. 201 * @param[in] error The packet error reporting service. Prefixes the 202 * received packet. 203 * @return EOK on success. 180 * @param[in] ip_phone The IP module phone used for (semi)remote calls. 181 * @param[in] device_id The device identifier. 182 * @param[in] packet The received packet or the received packet queue. 183 * @param[in] target The target internetwork module service to be 184 * delivered to. 185 * @param[in] error The packet error reporting service. Prefixes the 186 * received packet. 187 * 188 * @return EOK on success. 189 * 204 190 */ 205 191 int ip_received_error_msg_remote(int ip_phone, device_id_t device_id, 206 packet_t *packet, services_t target, services_t error)192 packet_t packet, services_t target, services_t error) 207 193 { 208 194 return generic_received_msg_remote(ip_phone, NET_IP_RECEIVED_ERROR, … … 214 200 * The packets may get fragmented if needed. 215 201 * 216 * @param[in] ip_phone The IP module phone used for (semi)remote calls. 217 * @param[in] device_id The device identifier. 218 * @param[in] packet The packet fragments as a packet queue. All the 219 * packets have to have the same destination address. 220 * @param[in] sender The sending module service. 221 * @param[in] error The packet error reporting service. Prefixes the 222 * received packet. 223 * @return EOK on success. 224 * @return Other error codes as defined for the generic_send_msg() 225 * function. 226 */ 227 int ip_send_msg_remote(int ip_phone, device_id_t device_id, packet_t *packet, 202 * @param[in] ip_phone The IP module phone used for (semi)remote calls. 203 * @param[in] device_id The device identifier. 204 * @param[in] packet The packet fragments as a packet queue. All the 205 * packets have to have the same destination address. 206 * @param[in] sender The sending module service. 207 * @param[in] error The packet error reporting service. Prefixes the 208 * received packet. 209 * 210 * @return EOK on success. 211 * @return Other error codes as defined for the generic_send_msg() function. 212 * 213 */ 214 int ip_send_msg_remote(int ip_phone, device_id_t device_id, packet_t packet, 228 215 services_t sender, services_t error) 229 216 { … … 236 223 * This gateway is used if no other route is found. 237 224 * 238 * @param[in] ip_phone The IP module phone used for (semi)remote calls. 239 * @param[in] device_id The device identifier. 240 * @param[in] gateway The default gateway. 225 * @param[in] ip_phone The IP module phone used for (semi)remote calls. 226 * @param[in] device_id The device identifier. 227 * @param[in] gateway The default gateway. 228 * 241 229 */ 242 230 int ip_set_gateway_req_remote(int ip_phone, device_id_t device_id,
Note:
See TracChangeset
for help on using the changeset viewer.