Changes in uspace/srv/net/ethip/ethip.c [4c6fd56:fafb8e5] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/net/ethip/ethip.c
r4c6fd56 rfafb8e5 1 1 /* 2 * Copyright (c) 20 23Jiri Svoboda2 * Copyright (c) 2012 Jiri Svoboda 3 3 * All rights reserved. 4 4 * … … 39 39 #include <async.h> 40 40 #include <errno.h> 41 #include <inet/eth_addr.h>42 41 #include <inet/iplink_srv.h> 43 42 #include <io/log.h> … … 59 58 static errno_t ethip_send6(iplink_srv_t *srv, iplink_sdu6_t *sdu); 60 59 static errno_t ethip_get_mtu(iplink_srv_t *srv, size_t *mtu); 61 static errno_t ethip_get_mac48(iplink_srv_t *srv, eth_addr_t *mac);62 static errno_t ethip_set_mac48(iplink_srv_t *srv, eth_addr_t *mac);60 static errno_t ethip_get_mac48(iplink_srv_t *srv, addr48_t *mac); 61 static errno_t ethip_set_mac48(iplink_srv_t *srv, addr48_t *mac); 63 62 static errno_t ethip_addr_add(iplink_srv_t *srv, inet_addr_t *addr); 64 63 static errno_t ethip_addr_remove(iplink_srv_t *srv, inet_addr_t *addr); … … 78 77 }; 79 78 80 static loc_srv_t *ethip_srv;81 82 79 static errno_t ethip_init(void) 83 80 { 84 81 async_set_fallback_port_handler(ethip_client_conn, NULL); 85 82 86 errno_t rc = loc_server_register(NAME , ðip_srv);83 errno_t rc = loc_server_register(NAME); 87 84 if (rc != EOK) { 88 85 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering server."); … … 117 114 } 118 115 119 rc = loc_service_register( ethip_srv,svc_name, &sid);116 rc = loc_service_register(svc_name, &sid); 120 117 if (rc != EOK) { 121 118 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service %s.", svc_name); … … 131 128 } 132 129 133 rc = loc_service_add_to_cat( ethip_srv,sid, iplink_cat);130 rc = loc_service_add_to_cat(sid, iplink_cat); 134 131 if (rc != EOK) { 135 132 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed adding %s to category.", svc_name); … … 180 177 eth_frame_t frame; 181 178 182 errno_t rc = arp_translate(nic, sdu->src, sdu->dest, &frame.dest);179 errno_t rc = arp_translate(nic, sdu->src, sdu->dest, frame.dest); 183 180 if (rc != EOK) { 184 181 log_msg(LOG_DEFAULT, LVL_WARN, "Failed to look up IPv4 address 0x%" … … 187 184 } 188 185 189 frame.src = nic->mac_addr;186 addr48(nic->mac_addr, frame.src); 190 187 frame.etype_len = ETYPE_IP; 191 188 frame.data = sdu->data; … … 211 208 eth_frame_t frame; 212 209 213 frame.dest = sdu->dest;214 frame.src = nic->mac_addr;210 addr48(sdu->dest, frame.dest); 211 addr48(nic->mac_addr, frame.src); 215 212 frame.etype_len = ETYPE_IPV6; 216 213 frame.data = sdu->data; … … 279 276 } 280 277 281 static errno_t ethip_get_mac48(iplink_srv_t *srv, eth_addr_t *mac)278 static errno_t ethip_get_mac48(iplink_srv_t *srv, addr48_t *mac) 282 279 { 283 280 log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_get_mac48()"); 284 281 285 282 ethip_nic_t *nic = (ethip_nic_t *) srv->arg; 286 *mac = nic->mac_addr;287 288 return EOK; 289 } 290 291 static errno_t ethip_set_mac48(iplink_srv_t *srv, eth_addr_t *mac)283 addr48(nic->mac_addr, *mac); 284 285 return EOK; 286 } 287 288 static errno_t ethip_set_mac48(iplink_srv_t *srv, addr48_t *mac) 292 289 { 293 290 log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_set_mac48()"); 294 291 295 292 ethip_nic_t *nic = (ethip_nic_t *) srv->arg; 296 nic->mac_addr = *mac;293 addr48(*mac, nic->mac_addr); 297 294 298 295 return EOK;
Note:
See TracChangeset
for help on using the changeset viewer.