Changes in uspace/srv/net/slip/slip.c [4c6fd56:f2d88f3] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/net/slip/slip.c
r4c6fd56 rf2d88f3 1 1 /* 2 * Copyright (c) 2023 Jiri Svoboda3 2 * Copyright (c) 2013 Jakub Jermar 4 3 * All rights reserved. … … 41 40 #include <loc.h> 42 41 #include <inet/addr.h> 43 #include <inet/eth_addr.h>44 42 #include <inet/iplink_srv.h> 45 43 #include <io/chardev.h> … … 64 62 static errno_t slip_send6(iplink_srv_t *, iplink_sdu6_t *); 65 63 static errno_t slip_get_mtu(iplink_srv_t *, size_t *); 66 static errno_t slip_get_mac48(iplink_srv_t *, eth_addr_t *);64 static errno_t slip_get_mac48(iplink_srv_t *, addr48_t *); 67 65 static errno_t slip_addr_add(iplink_srv_t *, inet_addr_t *); 68 66 static errno_t slip_addr_remove(iplink_srv_t *, inet_addr_t *); … … 178 176 } 179 177 180 errno_t slip_get_mac48(iplink_srv_t *src, eth_addr_t *mac)178 errno_t slip_get_mac48(iplink_srv_t *src, addr48_t *mac) 181 179 { 182 180 log_msg(LOG_DEFAULT, LVL_DEBUG, "slip_get_mac48()"); … … 307 305 chardev_t *chardev_out = NULL; 308 306 fid_t fid; 309 loc_srv_t *srv;310 307 errno_t rc; 311 308 … … 315 312 async_set_fallback_port_handler(slip_client_conn, NULL); 316 313 317 rc = loc_server_register(NAME , &srv);314 rc = loc_server_register(NAME); 318 315 if (rc != EOK) { 319 316 log_msg(LOG_DEFAULT, LVL_ERROR, … … 324 321 rc = loc_service_get_id(svcstr, &svcid, 0); 325 322 if (rc != EOK) { 326 loc_server_unregister(srv);327 323 log_msg(LOG_DEFAULT, LVL_ERROR, 328 324 "Failed getting ID for service %s", svcstr); … … 332 328 rc = loc_category_get_id(CAT_IPLINK, &iplinkcid, 0); 333 329 if (rc != EOK) { 334 loc_server_unregister(srv);335 330 log_msg(LOG_DEFAULT, LVL_ERROR, 336 331 "Failed to get category ID for %s", … … 345 340 sess_out = loc_service_connect(svcid, INTERFACE_DDF, 0); 346 341 if (!sess_out) { 347 loc_server_unregister(srv);348 342 log_msg(LOG_DEFAULT, LVL_ERROR, 349 343 "Failed to connect to service %s (ID=%d)", … … 354 348 rc = chardev_open(sess_out, &chardev_out); 355 349 if (rc != EOK) { 356 loc_server_unregister(srv);357 350 log_msg(LOG_DEFAULT, LVL_ERROR, 358 351 "Failed opening character device."); … … 378 371 } 379 372 380 rc = loc_service_register( srv,linkstr, &linksid);373 rc = loc_service_register(linkstr, &linksid); 381 374 if (rc != EOK) { 382 375 log_msg(LOG_DEFAULT, LVL_ERROR, … … 386 379 } 387 380 388 rc = loc_service_add_to_cat(srv, linksid, iplinkcid); 389 if (rc != EOK) { 390 loc_service_unregister(srv, linksid); 381 rc = loc_service_add_to_cat(linksid, iplinkcid); 382 if (rc != EOK) { 391 383 log_msg(LOG_DEFAULT, LVL_ERROR, 392 384 "Failed to add service %d (%s) to category %d (%s).", … … 407 399 408 400 fail: 409 loc_server_unregister(srv);410 401 chardev_close(chardev_out); 411 402 if (sess_out)
Note:
See TracChangeset
for help on using the changeset viewer.