Changes in uspace/srv/net/loopip/loopip.c [4c6fd56:984a9ba] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/net/loopip/loopip.c
r4c6fd56 r984a9ba 1 1 /* 2 * Copyright (c) 20 23Jiri Svoboda2 * Copyright (c) 2012 Jiri Svoboda 3 3 * All rights reserved. 4 4 * … … 41 41 #include <inet/iplink_srv.h> 42 42 #include <inet/addr.h> 43 #include <inet/eth_addr.h>44 43 #include <io/log.h> 45 44 #include <loc.h> … … 56 55 static errno_t loopip_send6(iplink_srv_t *srv, iplink_sdu6_t *sdu); 57 56 static errno_t loopip_get_mtu(iplink_srv_t *srv, size_t *mtu); 58 static errno_t loopip_get_mac48(iplink_srv_t *srv, eth_addr_t *mac);57 static errno_t loopip_get_mac48(iplink_srv_t *srv, addr48_t *mac); 59 58 static errno_t loopip_addr_add(iplink_srv_t *srv, inet_addr_t *addr); 60 59 static errno_t loopip_addr_remove(iplink_srv_t *srv, inet_addr_t *addr); … … 103 102 static errno_t loopip_init(void) 104 103 { 105 loc_srv_t *srv;106 107 104 async_set_fallback_port_handler(loopip_client_conn, NULL); 108 105 109 errno_t rc = loc_server_register(NAME , &srv);106 errno_t rc = loc_server_register(NAME); 110 107 if (rc != EOK) { 111 108 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering server."); … … 121 118 const char *svc_name = "net/loopback"; 122 119 service_id_t sid; 123 rc = loc_service_register(srv, svc_name, &sid); 124 if (rc != EOK) { 125 loc_server_unregister(srv); 120 rc = loc_service_register(svc_name, &sid); 121 if (rc != EOK) { 126 122 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service %s.", 127 123 svc_name); … … 132 128 rc = loc_category_get_id("iplink", &iplink_cat, IPC_FLAG_BLOCKING); 133 129 if (rc != EOK) { 134 loc_service_unregister(srv, sid);135 loc_server_unregister(srv);136 130 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed resolving category 'iplink'."); 137 131 return rc; 138 132 } 139 133 140 rc = loc_service_add_to_cat(srv, sid, iplink_cat); 141 if (rc != EOK) { 142 loc_service_unregister(srv, sid); 143 loc_server_unregister(srv); 134 rc = loc_service_add_to_cat(sid, iplink_cat); 135 if (rc != EOK) { 144 136 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed adding %s to category.", 145 137 svc_name); … … 148 140 149 141 fid_t fid = fibril_create(loopip_recv_fibril, NULL); 150 if (fid == 0) { 151 loc_service_unregister(srv, sid); 152 loc_server_unregister(srv); 153 return ENOMEM; 154 } 142 if (fid == 0) 143 return ENOMEM; 155 144 156 145 fibril_add_ready(fid); … … 242 231 } 243 232 244 static errno_t loopip_get_mac48(iplink_srv_t *src, eth_addr_t *mac)233 static errno_t loopip_get_mac48(iplink_srv_t *src, addr48_t *mac) 245 234 { 246 235 log_msg(LOG_DEFAULT, LVL_DEBUG, "loopip_get_mac48()");
Note:
See TracChangeset
for help on using the changeset viewer.