From a1a101df39387ef358e61b7a23da833e01376074 Mon Sep 17 00:00:00 2001 From: Vojtech Horky Date: Fri, 17 Aug 2012 18:58:51 +0200 Subject: [PATCH] Get rid of log_log_msg() All calls to log_msg(LVL_*) were rewritten to log_msg(LOG_DEFAULT, LVL_*). --- uspace/app/tester/stdio/logger1.c | 2 +- uspace/app/tester/stdio/logger2.c | 6 +- uspace/drv/char/i8042/i8042.c | 2 +- uspace/lib/c/generic/io/log.c | 6 +- uspace/lib/c/include/io/log.h | 9 +-- uspace/lib/drv/generic/log.c | 2 +- uspace/lib/usb/include/usb/debug.h | 2 +- uspace/srv/devman/devman.c | 56 +++++++-------- uspace/srv/devman/main.c | 84 +++++++++++----------- uspace/srv/net/ethip/arp.c | 8 +-- uspace/srv/net/ethip/ethip.c | 44 ++++++------ uspace/srv/net/ethip/ethip_nic.c | 66 ++++++++--------- uspace/srv/net/ethip/pdu.c | 30 ++++---- uspace/srv/net/inetsrv/addrobj.c | 18 ++--- uspace/srv/net/inetsrv/icmp.c | 6 +- uspace/srv/net/inetsrv/inet_link.c | 36 +++++----- uspace/srv/net/inetsrv/inetcfg.c | 38 +++++----- uspace/srv/net/inetsrv/inetping.c | 8 +-- uspace/srv/net/inetsrv/inetsrv.c | 26 +++---- uspace/srv/net/inetsrv/pdu.c | 12 ++-- uspace/srv/net/inetsrv/reass.c | 4 +- uspace/srv/net/inetsrv/sroute.c | 16 ++--- uspace/srv/net/loopip/loopip.c | 24 +++---- uspace/srv/net/tcp/conn.c | 140 ++++++++++++++++++------------------- uspace/srv/net/tcp/iqueue.c | 16 ++--- uspace/srv/net/tcp/ncsim.c | 16 ++--- uspace/srv/net/tcp/rqueue.c | 16 ++--- uspace/srv/net/tcp/segment.c | 14 ++-- uspace/srv/net/tcp/sock.c | 86 +++++++++++------------ uspace/srv/net/tcp/tcp.c | 30 ++++---- uspace/srv/net/tcp/tqueue.c | 44 ++++++------ uspace/srv/net/tcp/ucall.c | 38 +++++----- uspace/srv/net/udp/assoc.c | 42 +++++------ uspace/srv/net/udp/sock.c | 68 +++++++++--------- uspace/srv/net/udp/ucall.c | 14 ++-- uspace/srv/net/udp/udp.c | 6 +- uspace/srv/net/udp/udp_inet.c | 16 ++--- 37 files changed, 523 insertions(+), 528 deletions(-) diff --git a/uspace/app/tester/stdio/logger1.c b/uspace/app/tester/stdio/logger1.c index 2c873b2b2..6f1fc42ee 100644 --- a/uspace/app/tester/stdio/logger1.c +++ b/uspace/app/tester/stdio/logger1.c @@ -35,7 +35,7 @@ const char *test_logger1(void) { for (log_level_t level = 0; level < LVL_LIMIT; level++) { - log_msg(level, "Testing logger, level %d.", (int) level); + log_msg(LOG_DEFAULT, level, "Testing logger, level %d.", (int) level); } return NULL; diff --git a/uspace/app/tester/stdio/logger2.c b/uspace/app/tester/stdio/logger2.c index 491eedbeb..d3d25e97c 100644 --- a/uspace/app/tester/stdio/logger2.c +++ b/uspace/app/tester/stdio/logger2.c @@ -47,12 +47,12 @@ const char *test_logger2(void) * the output completely by setting visible level to FATAL. */ for (log_level_t level = LVL_ERROR; level < LVL_LIMIT; level++) { - log_msg(level, "Printing level %d (%s).", + log_msg(LOG_DEFAULT, level, "Printing level %d (%s).", (int) level, log_level_str(level)); - log_log_msg(log_alpha, level, + log_msg(log_alpha, level, "Printing level %d (%s) into alpha log.", (int) level, log_level_str(level)); - log_log_msg(log_bravo, level, + log_msg(log_bravo, level, "Printing level %d (%s) into bravo sub-log.", (int) level, log_level_str(level)); async_usleep(1000 * 100); diff --git a/uspace/drv/char/i8042/i8042.c b/uspace/drv/char/i8042/i8042.c index 1e650cac3..2153f2bf5 100644 --- a/uspace/drv/char/i8042/i8042.c +++ b/uspace/drv/char/i8042/i8042.c @@ -301,7 +301,7 @@ int i8042_init(i8042_t *dev, void *regs, size_t reg_size, int irq_kbd, const bool enabled = hw_res_enable_interrupt(parent_sess); if (!enabled) { - log_msg(LVL_ERROR, "Failed to enable interrupts: %s.", + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed to enable interrupts: %s.", ddf_dev_get_name(ddf_dev)); rc = EIO; goto error; diff --git a/uspace/lib/c/generic/io/log.c b/uspace/lib/c/generic/io/log.c index 0875025b6..551c1201f 100644 --- a/uspace/lib/c/generic/io/log.c +++ b/uspace/lib/c/generic/io/log.c @@ -191,12 +191,12 @@ log_t log_create(const char *name, log_t parent) * reporting level. * @param fmt Format string (no traling newline). */ -void log_log_msg(log_t ctx, log_level_t level, const char *fmt, ...) +void log_msg(log_t ctx, log_level_t level, const char *fmt, ...) { va_list args; va_start(args, fmt); - log_log_msgv(ctx, level, fmt, args); + log_msgv(ctx, level, fmt, args); va_end(args); } @@ -207,7 +207,7 @@ void log_log_msg(log_t ctx, log_level_t level, const char *fmt, ...) * reporting level. * @param fmt Format string (no trailing newline) */ -void log_log_msgv(log_t ctx, log_level_t level, const char *fmt, va_list args) +void log_msgv(log_t ctx, log_level_t level, const char *fmt, va_list args) { assert(level < LVL_LIMIT); diff --git a/uspace/lib/c/include/io/log.h b/uspace/lib/c/include/io/log.h index 56aa51569..b02071a34 100644 --- a/uspace/lib/c/include/io/log.h +++ b/uspace/lib/c/include/io/log.h @@ -61,13 +61,8 @@ extern int log_level_from_str(const char *, log_level_t *); extern int log_init(const char *); extern log_t log_create(const char *, log_t); -#define log_msg(level, format, ...) \ - log_log_msg(LOG_DEFAULT, (level), (format), ##__VA_ARGS__) -#define log_msgv(level, format, args) \ - log_log_msgv(LOG_DEFAULT, (level), (format), (args)) - -extern void log_log_msg(log_t, log_level_t, const char *, ...); -extern void log_log_msgv(log_t, log_level_t, const char *, va_list); +extern void log_msg(log_t, log_level_t, const char *, ...); +extern void log_msgv(log_t, log_level_t, const char *, va_list); #endif diff --git a/uspace/lib/drv/generic/log.c b/uspace/lib/drv/generic/log.c index d8a34f130..80df9c4ab 100644 --- a/uspace/lib/drv/generic/log.c +++ b/uspace/lib/drv/generic/log.c @@ -57,7 +57,7 @@ void ddf_msg(log_level_t level, const char *fmt, ...) va_list args; va_start(args, fmt); - log_msgv(level, fmt, args); + log_msgv(LOG_DEFAULT, level, fmt, args); va_end(args); } diff --git a/uspace/lib/usb/include/usb/debug.h b/uspace/lib/usb/include/usb/debug.h index e8e569c93..d73996be7 100644 --- a/uspace/lib/usb/include/usb/debug.h +++ b/uspace/lib/usb/include/usb/debug.h @@ -58,7 +58,7 @@ void usb_dump_standard_descriptor(FILE *, const char *, const char *, #endif #define usb_log_printf(level, format, ...) \ - log_msg(level, format, ##__VA_ARGS__) + log_msg(LOG_DEFAULT, level, format, ##__VA_ARGS__) /** Log fatal error. */ #define usb_log_fatal(format, ...) \ diff --git a/uspace/srv/devman/devman.c b/uspace/srv/devman/devman.c index c3538ab03..c943f0a27 100644 --- a/uspace/srv/devman/devman.c +++ b/uspace/srv/devman/devman.c @@ -150,7 +150,7 @@ void add_driver(driver_list_t *drivers_list, driver_t *drv) list_prepend(&drv->drivers, &drivers_list->drivers); fibril_mutex_unlock(&drivers_list->drivers_mutex); - log_msg(LVL_NOTE, "Driver `%s' was added to the list of available " + log_msg(LOG_DEFAULT, LVL_NOTE, "Driver `%s' was added to the list of available " "drivers.", drv->name); } @@ -241,7 +241,7 @@ bool parse_match_ids(char *buf, match_id_list_t *ids) */ bool read_match_ids(const char *conf_path, match_id_list_t *ids) { - log_msg(LVL_DEBUG, "read_match_ids(conf_path=\"%s\")", conf_path); + log_msg(LOG_DEFAULT, LVL_DEBUG, "read_match_ids(conf_path=\"%s\")", conf_path); bool suc = false; char *buf = NULL; @@ -251,7 +251,7 @@ bool read_match_ids(const char *conf_path, match_id_list_t *ids) fd = open(conf_path, O_RDONLY); if (fd < 0) { - log_msg(LVL_ERROR, "Unable to open `%s' for reading: %s.", + log_msg(LOG_DEFAULT, LVL_ERROR, "Unable to open `%s' for reading: %s.", conf_path, str_error(fd)); goto cleanup; } @@ -260,21 +260,21 @@ bool read_match_ids(const char *conf_path, match_id_list_t *ids) len = lseek(fd, 0, SEEK_END); lseek(fd, 0, SEEK_SET); if (len == 0) { - log_msg(LVL_ERROR, "Configuration file '%s' is empty.", + log_msg(LOG_DEFAULT, LVL_ERROR, "Configuration file '%s' is empty.", conf_path); goto cleanup; } buf = malloc(len + 1); if (buf == NULL) { - log_msg(LVL_ERROR, "Memory allocation failed when parsing file " + log_msg(LOG_DEFAULT, LVL_ERROR, "Memory allocation failed when parsing file " "'%s'.", conf_path); goto cleanup; } ssize_t read_bytes = read_all(fd, buf, len); if (read_bytes <= 0) { - log_msg(LVL_ERROR, "Unable to read file '%s' (%zd).", conf_path, + log_msg(LOG_DEFAULT, LVL_ERROR, "Unable to read file '%s' (%zd).", conf_path, read_bytes); goto cleanup; } @@ -313,7 +313,7 @@ cleanup: */ bool get_driver_info(const char *base_path, const char *name, driver_t *drv) { - log_msg(LVL_DEBUG, "get_driver_info(base_path=\"%s\", name=\"%s\")", + log_msg(LOG_DEFAULT, LVL_DEBUG, "get_driver_info(base_path=\"%s\", name=\"%s\")", base_path, name); assert(base_path != NULL && name != NULL && drv != NULL); @@ -345,7 +345,7 @@ bool get_driver_info(const char *base_path, const char *name, driver_t *drv) /* Check whether the driver's binary exists. */ struct stat s; if (stat(drv->binary_path, &s) == ENOENT) { /* FIXME!! */ - log_msg(LVL_ERROR, "Driver not found at path `%s'.", + log_msg(LOG_DEFAULT, LVL_ERROR, "Driver not found at path `%s'.", drv->binary_path); goto cleanup; } @@ -373,7 +373,7 @@ cleanup: */ int lookup_available_drivers(driver_list_t *drivers_list, const char *dir_path) { - log_msg(LVL_DEBUG, "lookup_available_drivers(dir=\"%s\")", dir_path); + log_msg(LOG_DEFAULT, LVL_DEBUG, "lookup_available_drivers(dir=\"%s\")", dir_path); int drv_cnt = 0; DIR *dir = NULL; @@ -407,7 +407,7 @@ bool create_root_nodes(dev_tree_t *tree) fun_node_t *fun; dev_node_t *dev; - log_msg(LVL_DEBUG, "create_root_nodes()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "create_root_nodes()"); fibril_rwlock_write_lock(&tree->rwlock); @@ -494,7 +494,7 @@ driver_t *find_best_match_driver(driver_list_t *drivers_list, dev_node_t *node) */ void attach_driver(dev_tree_t *tree, dev_node_t *dev, driver_t *drv) { - log_msg(LVL_DEBUG, "attach_driver(dev=\"%s\",drv=\"%s\")", + log_msg(LOG_DEFAULT, LVL_DEBUG, "attach_driver(dev=\"%s\",drv=\"%s\")", dev->pfun->pathname, drv->name); fibril_mutex_lock(&drv->driver_mutex); @@ -519,7 +519,7 @@ void detach_driver(dev_tree_t *tree, dev_node_t *dev) assert(drv != NULL); - log_msg(LVL_DEBUG, "detach_driver(dev=\"%s\",drv=\"%s\")", + log_msg(LOG_DEFAULT, LVL_DEBUG, "detach_driver(dev=\"%s\",drv=\"%s\")", dev->pfun->pathname, drv->name); fibril_mutex_lock(&drv->driver_mutex); @@ -544,11 +544,11 @@ bool start_driver(driver_t *drv) assert(fibril_mutex_is_locked(&drv->driver_mutex)); - log_msg(LVL_DEBUG, "start_driver(drv=\"%s\")", drv->name); + log_msg(LOG_DEFAULT, LVL_DEBUG, "start_driver(drv=\"%s\")", drv->name); rc = task_spawnl(NULL, drv->binary_path, drv->binary_path, NULL); if (rc != EOK) { - log_msg(LVL_ERROR, "Spawning driver `%s' (%s) failed: %s.", + log_msg(LOG_DEFAULT, LVL_ERROR, "Spawning driver `%s' (%s) failed: %s.", drv->name, drv->binary_path, str_error(rc)); return false; } @@ -593,7 +593,7 @@ static void pass_devices_to_driver(driver_t *driver, dev_tree_t *tree) dev_node_t *dev; link_t *link; - log_msg(LVL_DEBUG, "pass_devices_to_driver(driver=\"%s\")", + log_msg(LOG_DEFAULT, LVL_DEBUG, "pass_devices_to_driver(driver=\"%s\")", driver->name); fibril_mutex_lock(&driver->driver_mutex); @@ -613,7 +613,7 @@ static void pass_devices_to_driver(driver_t *driver, dev_tree_t *tree) continue; } - log_msg(LVL_DEBUG, "pass_devices_to_driver: dev->refcnt=%d\n", + log_msg(LOG_DEFAULT, LVL_DEBUG, "pass_devices_to_driver: dev->refcnt=%d\n", (int)atomic_get(&dev->refcnt)); dev_add_ref(dev); @@ -649,7 +649,7 @@ static void pass_devices_to_driver(driver_t *driver, dev_tree_t *tree) * the driver would be added to the device list and started * immediately and possibly started here as well. */ - log_msg(LVL_DEBUG, "Driver `%s' enters running state.", driver->name); + log_msg(LOG_DEFAULT, LVL_DEBUG, "Driver `%s' enters running state.", driver->name); driver->state = DRIVER_RUNNING; fibril_mutex_unlock(&driver->driver_mutex); @@ -666,7 +666,7 @@ static void pass_devices_to_driver(driver_t *driver, dev_tree_t *tree) */ void initialize_running_driver(driver_t *driver, dev_tree_t *tree) { - log_msg(LVL_DEBUG, "initialize_running_driver(driver=\"%s\")", + log_msg(LOG_DEFAULT, LVL_DEBUG, "initialize_running_driver(driver=\"%s\")", driver->name); /* @@ -760,7 +760,7 @@ void add_device(driver_t *drv, dev_node_t *dev, dev_tree_t *tree) * We do not expect to have driver's mutex locked as we do not * access any structures that would affect driver_t. */ - log_msg(LVL_DEBUG, "add_device(drv=\"%s\", dev=\"%s\")", + log_msg(LOG_DEFAULT, LVL_DEBUG, "add_device(drv=\"%s\", dev=\"%s\")", drv->name, dev->pfun->name); /* Send the device to the driver. */ @@ -826,7 +826,7 @@ bool assign_driver(dev_node_t *dev, driver_list_t *drivers_list, */ driver_t *drv = find_best_match_driver(drivers_list, dev); if (drv == NULL) { - log_msg(LVL_ERROR, "No driver found for device `%s'.", + log_msg(LOG_DEFAULT, LVL_ERROR, "No driver found for device `%s'.", dev->pfun->pathname); return false; } @@ -866,7 +866,7 @@ int driver_dev_remove(dev_tree_t *tree, dev_node_t *dev) assert(dev != NULL); - log_msg(LVL_DEBUG, "driver_dev_remove(%p)", dev); + log_msg(LOG_DEFAULT, LVL_DEBUG, "driver_dev_remove(%p)", dev); fibril_rwlock_read_lock(&tree->rwlock); drv = dev->drv; @@ -889,7 +889,7 @@ int driver_dev_gone(dev_tree_t *tree, dev_node_t *dev) assert(dev != NULL); - log_msg(LVL_DEBUG, "driver_dev_gone(%p)", dev); + log_msg(LOG_DEFAULT, LVL_DEBUG, "driver_dev_gone(%p)", dev); fibril_rwlock_read_lock(&tree->rwlock); drv = dev->drv; @@ -910,7 +910,7 @@ int driver_fun_online(dev_tree_t *tree, fun_node_t *fun) driver_t *drv; devman_handle_t handle; - log_msg(LVL_DEBUG, "driver_fun_online(%p)", fun); + log_msg(LOG_DEFAULT, LVL_DEBUG, "driver_fun_online(%p)", fun); fibril_rwlock_read_lock(&tree->rwlock); @@ -938,7 +938,7 @@ int driver_fun_offline(dev_tree_t *tree, fun_node_t *fun) driver_t *drv; devman_handle_t handle; - log_msg(LVL_DEBUG, "driver_fun_offline(%p)", fun); + log_msg(LOG_DEFAULT, LVL_DEBUG, "driver_fun_offline(%p)", fun); fibril_rwlock_read_lock(&tree->rwlock); if (fun->dev == NULL) { @@ -969,7 +969,7 @@ int driver_fun_offline(dev_tree_t *tree, fun_node_t *fun) */ bool init_device_tree(dev_tree_t *tree, driver_list_t *drivers_list) { - log_msg(LVL_DEBUG, "init_device_tree()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "init_device_tree()"); tree->current_handle = 0; @@ -1260,7 +1260,7 @@ static bool set_fun_path(dev_tree_t *tree, fun_node_t *fun, fun_node_t *parent) fun->pathname = (char *) malloc(pathsize); if (fun->pathname == NULL) { - log_msg(LVL_ERROR, "Failed to allocate device path."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed to allocate device path."); return false; } @@ -1288,7 +1288,7 @@ bool insert_dev_node(dev_tree_t *tree, dev_node_t *dev, fun_node_t *pfun) { assert(fibril_rwlock_is_write_locked(&tree->rwlock)); - log_msg(LVL_DEBUG, "insert_dev_node(dev=%p, pfun=%p [\"%s\"])", + log_msg(LOG_DEFAULT, LVL_DEBUG, "insert_dev_node(dev=%p, pfun=%p [\"%s\"])", dev, pfun, pfun->pathname); /* Add the node to the handle-to-node map. */ @@ -1312,7 +1312,7 @@ void remove_dev_node(dev_tree_t *tree, dev_node_t *dev) { assert(fibril_rwlock_is_write_locked(&tree->rwlock)); - log_msg(LVL_DEBUG, "remove_dev_node(dev=%p)", dev); + log_msg(LOG_DEFAULT, LVL_DEBUG, "remove_dev_node(dev=%p)", dev); /* Remove node from the handle-to-node map. */ unsigned long key = dev->handle; diff --git a/uspace/srv/devman/main.c b/uspace/srv/devman/main.c index 0fc45c45b..23514534a 100644 --- a/uspace/srv/devman/main.c +++ b/uspace/srv/devman/main.c @@ -72,7 +72,7 @@ static driver_t *devman_driver_register(ipc_callid_t callid, ipc_call_t *call) driver_t *driver = NULL; char *drv_name = NULL; - log_msg(LVL_DEBUG, "devman_driver_register"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "devman_driver_register"); /* Get driver name. */ int rc = async_data_write_accept((void **) &drv_name, true, 0, 0, 0, 0); @@ -81,13 +81,13 @@ static driver_t *devman_driver_register(ipc_callid_t callid, ipc_call_t *call) return NULL; } - log_msg(LVL_DEBUG, "The `%s' driver is trying to register.", + log_msg(LOG_DEFAULT, LVL_DEBUG, "The `%s' driver is trying to register.", drv_name); /* Find driver structure. */ driver = find_driver(&drivers_list, drv_name); if (driver == NULL) { - log_msg(LVL_ERROR, "No driver named `%s' was found.", drv_name); + log_msg(LOG_DEFAULT, LVL_ERROR, "No driver named `%s' was found.", drv_name); free(drv_name); drv_name = NULL; async_answer_0(callid, ENOENT); @@ -101,7 +101,7 @@ static driver_t *devman_driver_register(ipc_callid_t callid, ipc_call_t *call) if (driver->sess) { /* We already have a connection to the driver. */ - log_msg(LVL_ERROR, "Driver '%s' already started.\n", + log_msg(LOG_DEFAULT, LVL_ERROR, "Driver '%s' already started.\n", driver->name); fibril_mutex_unlock(&driver->driver_mutex); async_answer_0(callid, EEXISTS); @@ -111,7 +111,7 @@ static driver_t *devman_driver_register(ipc_callid_t callid, ipc_call_t *call) switch (driver->state) { case DRIVER_NOT_STARTED: /* Somebody started the driver manually. */ - log_msg(LVL_NOTE, "Driver '%s' started manually.\n", + log_msg(LOG_DEFAULT, LVL_NOTE, "Driver '%s' started manually.\n", driver->name); driver->state = DRIVER_STARTING; break; @@ -124,7 +124,7 @@ static driver_t *devman_driver_register(ipc_callid_t callid, ipc_call_t *call) } /* Create connection to the driver. */ - log_msg(LVL_DEBUG, "Creating connection to the `%s' driver.", + log_msg(LOG_DEFAULT, LVL_DEBUG, "Creating connection to the `%s' driver.", driver->name); driver->sess = async_callback_receive(EXCHANGE_PARALLEL); if (!driver->sess) { @@ -135,7 +135,7 @@ static driver_t *devman_driver_register(ipc_callid_t callid, ipc_call_t *call) /* FIXME: Work around problem with callback sessions */ async_sess_args_set(driver->sess, DRIVER_DEVMAN, 0, 0); - log_msg(LVL_NOTE, + log_msg(LOG_DEFAULT, LVL_NOTE, "The `%s' driver was successfully registered as running.", driver->name); @@ -146,7 +146,7 @@ static driver_t *devman_driver_register(ipc_callid_t callid, ipc_call_t *call) */ fid_t fid = fibril_create(init_running_drv, driver); if (fid == 0) { - log_msg(LVL_ERROR, "Failed to create initialization fibril " \ + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed to create initialization fibril " \ "for driver `%s'.", driver->name); fibril_mutex_unlock(&driver->driver_mutex); async_answer_0(callid, ENOMEM); @@ -175,7 +175,7 @@ static int devman_receive_match_id(match_id_list_t *match_ids) callid = async_get_call(&call); if (DEVMAN_ADD_MATCH_ID != IPC_GET_IMETHOD(call)) { - log_msg(LVL_ERROR, + log_msg(LOG_DEFAULT, LVL_ERROR, "Invalid protocol when trying to receive match id."); async_answer_0(callid, EINVAL); delete_match_id(match_id); @@ -183,7 +183,7 @@ static int devman_receive_match_id(match_id_list_t *match_ids) } if (match_id == NULL) { - log_msg(LVL_ERROR, "Failed to allocate match id."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed to allocate match id."); async_answer_0(callid, ENOMEM); return ENOMEM; } @@ -197,14 +197,14 @@ static int devman_receive_match_id(match_id_list_t *match_ids) match_id->id = match_id_str; if (rc != EOK) { delete_match_id(match_id); - log_msg(LVL_ERROR, "Failed to receive match id string: %s.", + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed to receive match id string: %s.", str_error(rc)); return rc; } list_append(&match_id->link, &match_ids->ids); - log_msg(LVL_DEBUG, "Received match id `%s', score %d.", + log_msg(LOG_DEFAULT, LVL_DEBUG, "Received match id `%s', score %d.", match_id->id, match_id->score); return rc; } @@ -247,7 +247,7 @@ static int online_function(fun_node_t *fun) if (fun->state == FUN_ON_LINE) { fibril_rwlock_write_unlock(&device_tree.rwlock); - log_msg(LVL_WARN, "Function %s is already on line.", + log_msg(LOG_DEFAULT, LVL_WARN, "Function %s is already on line.", fun->pathname); return EOK; } @@ -263,7 +263,7 @@ static int online_function(fun_node_t *fun) dev_add_ref(dev); } - log_msg(LVL_DEBUG, "devman_add_function(fun=\"%s\")", fun->pathname); + log_msg(LOG_DEFAULT, LVL_DEBUG, "devman_add_function(fun=\"%s\")", fun->pathname); if (fun->ftype == fun_inner) { dev = fun->child; @@ -281,7 +281,7 @@ static int online_function(fun_node_t *fun) */ fid_t assign_fibril = fibril_create(assign_driver_fibril, dev); if (assign_fibril == 0) { - log_msg(LVL_ERROR, "Failed to create fibril for " + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed to create fibril for " "assigning driver."); /* XXX Cleanup */ fibril_rwlock_write_unlock(&device_tree.rwlock); @@ -304,13 +304,13 @@ static int offline_function(fun_node_t *fun) if (fun->state == FUN_OFF_LINE) { fibril_rwlock_write_unlock(&device_tree.rwlock); - log_msg(LVL_WARN, "Function %s is already off line.", + log_msg(LOG_DEFAULT, LVL_WARN, "Function %s is already off line.", fun->pathname); return EOK; } if (fun->ftype == fun_inner) { - log_msg(LVL_DEBUG, "Offlining inner function %s.", + log_msg(LOG_DEFAULT, LVL_DEBUG, "Offlining inner function %s.", fun->pathname); if (fun->child != NULL) { @@ -358,7 +358,7 @@ static int offline_function(fun_node_t *fun) rc = loc_service_unregister(fun->service_id); if (rc != EOK) { fibril_rwlock_write_unlock(&device_tree.rwlock); - log_msg(LVL_ERROR, "Failed unregistering tree service."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed unregistering tree service."); return EIO; } @@ -390,7 +390,7 @@ static void devman_add_function(ipc_callid_t callid, ipc_call_t *call) if (ftype != fun_inner && ftype != fun_exposed) { /* Unknown function type */ - log_msg(LVL_ERROR, + log_msg(LOG_DEFAULT, LVL_ERROR, "Unknown function type %d provided by driver.", (int) ftype); @@ -506,10 +506,10 @@ static void devman_add_function_to_cat(ipc_callid_t callid, ipc_call_t *call) rc = loc_category_get_id(cat_name, &cat_id, IPC_FLAG_BLOCKING); if (rc == EOK) { loc_service_add_to_cat(fun->service_id, cat_id); - log_msg(LVL_NOTE, "Function `%s' added to category `%s'.", + log_msg(LOG_DEFAULT, LVL_NOTE, "Function `%s' added to category `%s'.", fun->pathname, cat_name); } else { - log_msg(LVL_ERROR, "Failed adding function `%s' to category " + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed adding function `%s' to category " "`%s'.", fun->pathname, cat_name); } @@ -528,7 +528,7 @@ static void devman_drv_fun_online(ipc_callid_t iid, ipc_call_t *icall, fun_node_t *fun; int rc; - log_msg(LVL_DEBUG, "devman_drv_fun_online()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "devman_drv_fun_online()"); fun = find_fun_node(&device_tree, IPC_GET_ARG1(*icall)); if (fun == NULL) { @@ -619,7 +619,7 @@ static void devman_remove_function(ipc_callid_t callid, ipc_call_t *call) fibril_rwlock_write_lock(&tree->rwlock); - log_msg(LVL_DEBUG, "devman_remove_function(fun='%s')", fun->pathname); + log_msg(LOG_DEFAULT, LVL_DEBUG, "devman_remove_function(fun='%s')", fun->pathname); /* Check function state */ if (fun->state == FUN_REMOVED) { @@ -652,7 +652,7 @@ static void devman_remove_function(ipc_callid_t callid, ipc_call_t *call) /* Verify that driver succeeded and removed all functions */ if (gone_rc != EOK || !list_empty(&dev->functions)) { - log_msg(LVL_ERROR, "Driver did not remove " + log_msg(LOG_DEFAULT, LVL_ERROR, "Driver did not remove " "functions for device that is gone. " "Device node is now defunct."); @@ -691,7 +691,7 @@ static void devman_remove_function(ipc_callid_t callid, ipc_call_t *call) /* Unregister from location service */ rc = loc_service_unregister(fun->service_id); if (rc != EOK) { - log_msg(LVL_ERROR, "Failed unregistering tree " + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed unregistering tree " "service."); fibril_rwlock_write_unlock(&tree->rwlock); fun_busy_unlock(fun); @@ -711,7 +711,7 @@ static void devman_remove_function(ipc_callid_t callid, ipc_call_t *call) /* Delete ref added above when looking up function */ fun_del_ref(fun); - log_msg(LVL_DEBUG, "devman_remove_function() succeeded."); + log_msg(LOG_DEFAULT, LVL_DEBUG, "devman_remove_function() succeeded."); async_answer_0(callid, EOK); } @@ -725,7 +725,7 @@ static int init_running_drv(void *drv) driver_t *driver = (driver_t *) drv; initialize_running_driver(driver, &device_tree); - log_msg(LVL_DEBUG, "The `%s` driver was successfully initialized.", + log_msg(LOG_DEFAULT, LVL_DEBUG, "The `%s` driver was successfully initialized.", driver->name); return 0; } @@ -741,7 +741,7 @@ static void devman_connection_driver(ipc_callid_t iid, ipc_call_t *icall) client = async_get_client_data(); if (client == NULL) { - log_msg(LVL_ERROR, "Failed to allocate client data."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed to allocate client data."); return; } @@ -1228,14 +1228,14 @@ static void devman_forward(ipc_callid_t iid, ipc_call_t *icall, * connecting to a device or to a function. */ if (dev == NULL) { - log_msg(LVL_ERROR, "IPC forwarding failed - no device or " + log_msg(LOG_DEFAULT, LVL_ERROR, "IPC forwarding failed - no device or " "function with handle %" PRIun " was found.", handle); async_answer_0(iid, ENOENT); goto cleanup; } if (fun == NULL && !drv_to_parent) { - log_msg(LVL_ERROR, NAME ": devman_forward error - cannot " + log_msg(LOG_DEFAULT, LVL_ERROR, NAME ": devman_forward error - cannot " "connect to handle %" PRIun ", refers to a device.", handle); async_answer_0(iid, ENOENT); @@ -1263,7 +1263,7 @@ static void devman_forward(ipc_callid_t iid, ipc_call_t *icall, fibril_rwlock_read_unlock(&device_tree.rwlock); if (driver == NULL) { - log_msg(LVL_ERROR, "IPC forwarding refused - " \ + log_msg(LOG_DEFAULT, LVL_ERROR, "IPC forwarding refused - " \ "the device %" PRIun " is not in usable state.", handle); async_answer_0(iid, ENOENT); goto cleanup; @@ -1276,18 +1276,18 @@ static void devman_forward(ipc_callid_t iid, ipc_call_t *icall, method = DRIVER_CLIENT; if (!driver->sess) { - log_msg(LVL_ERROR, + log_msg(LOG_DEFAULT, LVL_ERROR, "Could not forward to driver `%s'.", driver->name); async_answer_0(iid, EINVAL); goto cleanup; } if (fun != NULL) { - log_msg(LVL_DEBUG, + log_msg(LOG_DEFAULT, LVL_DEBUG, "Forwarding request for `%s' function to driver `%s'.", fun->pathname, driver->name); } else { - log_msg(LVL_DEBUG, + log_msg(LOG_DEFAULT, LVL_DEBUG, "Forwarding request for `%s' device to driver `%s'.", dev->pfun->pathname, driver->name); } @@ -1319,7 +1319,7 @@ static void devman_connection_loc(ipc_callid_t iid, ipc_call_t *icall) fibril_rwlock_read_lock(&device_tree.rwlock); if (fun == NULL || fun->dev == NULL || fun->dev->drv == NULL) { - log_msg(LVL_WARN, "devman_connection_loc(): function " + log_msg(LOG_DEFAULT, LVL_WARN, "devman_connection_loc(): function " "not found.\n"); fibril_rwlock_read_unlock(&device_tree.rwlock); async_answer_0(iid, ENOENT); @@ -1337,7 +1337,7 @@ static void devman_connection_loc(ipc_callid_t iid, ipc_call_t *icall) IPC_FF_NONE); async_exchange_end(exch); - log_msg(LVL_DEBUG, + log_msg(LOG_DEFAULT, LVL_DEBUG, "Forwarding loc service request for `%s' function to driver `%s'.", fun->pathname, driver->name); @@ -1393,21 +1393,21 @@ static void devman_client_data_destroy(void *data) /** Initialize device manager internal structures. */ static bool devman_init(void) { - log_msg(LVL_DEBUG, "devman_init - looking for available drivers."); + log_msg(LOG_DEFAULT, LVL_DEBUG, "devman_init - looking for available drivers."); /* Initialize list of available drivers. */ init_driver_list(&drivers_list); if (lookup_available_drivers(&drivers_list, DRIVER_DEFAULT_STORE) == 0) { - log_msg(LVL_FATAL, "No drivers found."); + log_msg(LOG_DEFAULT, LVL_FATAL, "No drivers found."); return false; } - log_msg(LVL_DEBUG, "devman_init - list of drivers has been initialized."); + log_msg(LOG_DEFAULT, LVL_DEBUG, "devman_init - list of drivers has been initialized."); /* Create root device node. */ if (!init_device_tree(&device_tree, &drivers_list)) { - log_msg(LVL_FATAL, "Failed to initialize device tree."); + log_msg(LOG_DEFAULT, LVL_FATAL, "Failed to initialize device tree."); return false; } @@ -1439,14 +1439,14 @@ int main(int argc, char *argv[]) async_set_client_connection(devman_connection); if (!devman_init()) { - log_msg(LVL_ERROR, "Error while initializing service."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Error while initializing service."); return -1; } /* Register device manager at naming service. */ rc = service_register(SERVICE_DEVMAN); if (rc != EOK) { - log_msg(LVL_ERROR, "Failed registering as a service."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering as a service."); return rc; } diff --git a/uspace/srv/net/ethip/arp.c b/uspace/srv/net/ethip/arp.c index cb62260f4..16bd5914a 100644 --- a/uspace/srv/net/ethip/arp.c +++ b/uspace/srv/net/ethip/arp.c @@ -58,18 +58,18 @@ void arp_received(ethip_nic_t *nic, eth_frame_t *frame) arp_eth_packet_t reply; ethip_link_addr_t *laddr; - log_msg(LVL_DEBUG, "arp_received()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "arp_received()"); rc = arp_pdu_decode(frame->data, frame->size, &packet); if (rc != EOK) return; - log_msg(LVL_DEBUG, "ARP PDU decoded, opcode=%d, tpa=%x", + log_msg(LOG_DEFAULT, LVL_DEBUG, "ARP PDU decoded, opcode=%d, tpa=%x", packet.opcode, packet.target_proto_addr.ipv4); laddr = ethip_nic_addr_find(nic, &packet.target_proto_addr); if (laddr != NULL) { - log_msg(LVL_DEBUG, "Request/reply to my address"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "Request/reply to my address"); (void) atrans_add(&packet.sender_proto_addr, &packet.sender_hw_addr); @@ -121,7 +121,7 @@ static int arp_send_packet(ethip_nic_t *nic, arp_eth_packet_t *packet) void *fdata; size_t fsize; - log_msg(LVL_DEBUG, "arp_send_packet()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "arp_send_packet()"); rc = arp_pdu_encode(packet, &pdata, &psize); if (rc != EOK) diff --git a/uspace/srv/net/ethip/ethip.c b/uspace/srv/net/ethip/ethip.c index ae15f6306..88cba31c9 100644 --- a/uspace/srv/net/ethip/ethip.c +++ b/uspace/srv/net/ethip/ethip.c @@ -76,7 +76,7 @@ static int ethip_init(void) int rc = loc_server_register(NAME); if (rc != EOK) { - log_msg(LVL_ERROR, "Failed registering server."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering server."); return rc; } @@ -95,7 +95,7 @@ int ethip_iplink_init(ethip_nic_t *nic) static unsigned link_num = 0; char *svc_name = NULL; - log_msg(LVL_DEBUG, "ethip_iplink_init()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_iplink_init()"); iplink_srv_init(&nic->iplink); nic->iplink.ops = ðip_iplink_ops; @@ -103,13 +103,13 @@ int ethip_iplink_init(ethip_nic_t *nic) rc = asprintf(&svc_name, "net/eth%u", ++link_num); if (rc < 0) { - log_msg(LVL_ERROR, "Out of memory."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Out of memory."); goto error; } rc = loc_service_register(svc_name, &sid); if (rc != EOK) { - log_msg(LVL_ERROR, "Failed registering service %s.", svc_name); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service %s.", svc_name); goto error; } @@ -117,13 +117,13 @@ int ethip_iplink_init(ethip_nic_t *nic) rc = loc_category_get_id("iplink", &iplink_cat, IPC_FLAG_BLOCKING); if (rc != EOK) { - log_msg(LVL_ERROR, "Failed resolving category 'iplink'."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed resolving category 'iplink'."); goto error; } rc = loc_service_add_to_cat(sid, iplink_cat); if (rc != EOK) { - log_msg(LVL_ERROR, "Failed adding %s to category.", svc_name); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed adding %s to category.", svc_name); goto error; } @@ -141,10 +141,10 @@ static void ethip_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg) service_id_t sid; sid = (service_id_t)IPC_GET_ARG1(*icall); - log_msg(LVL_DEBUG, "ethip_client_conn(%u)", (unsigned)sid); + log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_client_conn(%u)", (unsigned)sid); nic = ethip_nic_find_by_iplink_sid(sid); if (nic == NULL) { - log_msg(LVL_WARN, "Uknown service ID."); + log_msg(LOG_DEFAULT, LVL_WARN, "Uknown service ID."); return; } @@ -153,13 +153,13 @@ static void ethip_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg) static int ethip_open(iplink_srv_t *srv) { - log_msg(LVL_DEBUG, "ethip_open()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_open()"); return EOK; } static int ethip_close(iplink_srv_t *srv) { - log_msg(LVL_DEBUG, "ethip_close()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_close()"); return EOK; } @@ -172,11 +172,11 @@ static int ethip_send(iplink_srv_t *srv, iplink_srv_sdu_t *sdu) mac48_addr_t dest_mac_addr; int rc; - log_msg(LVL_DEBUG, "ethip_send()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_send()"); rc = arp_translate(nic, &sdu->lsrc, &sdu->ldest, &dest_mac_addr); if (rc != EOK) { - log_msg(LVL_WARN, "Failed to look up IP address 0x%" PRIx32, + log_msg(LOG_DEFAULT, LVL_WARN, "Failed to look up IP address 0x%" PRIx32, sdu->ldest.ipv4); return rc; } @@ -199,18 +199,18 @@ static int ethip_send(iplink_srv_t *srv, iplink_srv_sdu_t *sdu) int ethip_received(iplink_srv_t *srv, void *data, size_t size) { - log_msg(LVL_DEBUG, "ethip_received(): srv=%p", srv); + log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_received(): srv=%p", srv); ethip_nic_t *nic = (ethip_nic_t *)srv->arg; eth_frame_t frame; iplink_srv_sdu_t sdu; int rc; - log_msg(LVL_DEBUG, "ethip_received()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_received()"); - log_msg(LVL_DEBUG, " - eth_pdu_decode"); + log_msg(LOG_DEFAULT, LVL_DEBUG, " - eth_pdu_decode"); rc = eth_pdu_decode(data, size, &frame); if (rc != EOK) { - log_msg(LVL_DEBUG, " - eth_pdu_decode failed"); + log_msg(LOG_DEFAULT, LVL_DEBUG, " - eth_pdu_decode failed"); return rc; } @@ -219,16 +219,16 @@ int ethip_received(iplink_srv_t *srv, void *data, size_t size) arp_received(nic, &frame); break; case ETYPE_IP: - log_msg(LVL_DEBUG, " - construct SDU"); + log_msg(LOG_DEFAULT, LVL_DEBUG, " - construct SDU"); sdu.lsrc.ipv4 = (192 << 24) | (168 << 16) | (0 << 8) | 1; sdu.ldest.ipv4 = (192 << 24) | (168 << 16) | (0 << 8) | 4; sdu.data = frame.data; sdu.size = frame.size; - log_msg(LVL_DEBUG, " - call iplink_ev_recv"); + log_msg(LOG_DEFAULT, LVL_DEBUG, " - call iplink_ev_recv"); rc = iplink_ev_recv(&nic->iplink, &sdu); break; default: - log_msg(LVL_DEBUG, "Unknown ethertype 0x%" PRIx16, + log_msg(LOG_DEFAULT, LVL_DEBUG, "Unknown ethertype 0x%" PRIx16, frame.etype_len); } @@ -238,7 +238,7 @@ int ethip_received(iplink_srv_t *srv, void *data, size_t size) static int ethip_get_mtu(iplink_srv_t *srv, size_t *mtu) { - log_msg(LVL_DEBUG, "ethip_get_mtu()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_get_mtu()"); *mtu = 1500; return EOK; } @@ -247,7 +247,7 @@ static int ethip_addr_add(iplink_srv_t *srv, iplink_srv_addr_t *addr) { ethip_nic_t *nic = (ethip_nic_t *)srv->arg; - log_msg(LVL_DEBUG, "ethip_addr_add(0x%" PRIx32 ")", addr->ipv4); + log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_addr_add(0x%" PRIx32 ")", addr->ipv4); return ethip_nic_addr_add(nic, addr); } @@ -255,7 +255,7 @@ static int ethip_addr_remove(iplink_srv_t *srv, iplink_srv_addr_t *addr) { ethip_nic_t *nic = (ethip_nic_t *)srv->arg; - log_msg(LVL_DEBUG, "ethip_addr_remove(0x%" PRIx32 ")", addr->ipv4); + log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_addr_remove(0x%" PRIx32 ")", addr->ipv4); return ethip_nic_addr_add(nic, addr); } diff --git a/uspace/srv/net/ethip/ethip_nic.c b/uspace/srv/net/ethip/ethip_nic.c index 01b63bc0b..d23e06bdb 100644 --- a/uspace/srv/net/ethip/ethip_nic.c +++ b/uspace/srv/net/ethip/ethip_nic.c @@ -67,14 +67,14 @@ static int ethip_nic_check_new(void) rc = loc_category_get_id("nic", &iplink_cat, IPC_FLAG_BLOCKING); if (rc != EOK) { - log_msg(LVL_ERROR, "Failed resolving category 'nic'."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed resolving category 'nic'."); fibril_mutex_unlock(ðip_discovery_lock); return ENOENT; } rc = loc_category_get_svcs(iplink_cat, &svcs, &count); if (rc != EOK) { - log_msg(LVL_ERROR, "Failed getting list of IP links."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed getting list of IP links."); fibril_mutex_unlock(ðip_discovery_lock); return EIO; } @@ -92,11 +92,11 @@ static int ethip_nic_check_new(void) } if (!already_known) { - log_msg(LVL_DEBUG, "Found NIC '%lu'", + log_msg(LOG_DEFAULT, LVL_DEBUG, "Found NIC '%lu'", (unsigned long) svcs[i]); rc = ethip_nic_open(svcs[i]); if (rc != EOK) - log_msg(LVL_ERROR, "Could not open NIC."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Could not open NIC."); } } @@ -109,7 +109,7 @@ static ethip_nic_t *ethip_nic_new(void) ethip_nic_t *nic = calloc(1, sizeof(ethip_nic_t)); if (nic == NULL) { - log_msg(LVL_ERROR, "Failed allocating NIC structure. " + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed allocating NIC structure. " "Out of memory."); return NULL; } @@ -125,7 +125,7 @@ static ethip_link_addr_t *ethip_nic_addr_new(iplink_srv_addr_t *addr) ethip_link_addr_t *laddr = calloc(1, sizeof(ethip_link_addr_t)); if (laddr == NULL) { - log_msg(LVL_ERROR, "Failed allocating NIC address structure. " + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed allocating NIC address structure. " "Out of memory."); return NULL; } @@ -152,20 +152,20 @@ static int ethip_nic_open(service_id_t sid) bool in_list = false; nic_address_t nic_address; - log_msg(LVL_DEBUG, "ethip_nic_open()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_open()"); ethip_nic_t *nic = ethip_nic_new(); if (nic == NULL) return ENOMEM; int rc = loc_service_get_name(sid, &nic->svc_name); if (rc != EOK) { - log_msg(LVL_ERROR, "Failed getting service name."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed getting service name."); goto error; } nic->sess = loc_service_connect(EXCHANGE_SERIALIZE, sid, 0); if (nic->sess == NULL) { - log_msg(LVL_ERROR, "Failed connecting '%s'", nic->svc_name); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed connecting '%s'", nic->svc_name); goto error; } @@ -173,12 +173,12 @@ static int ethip_nic_open(service_id_t sid) rc = nic_callback_create(nic->sess, ethip_nic_cb_conn, nic); if (rc != EOK) { - log_msg(LVL_ERROR, "Failed creating callback connection " + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed creating callback connection " "from '%s'", nic->svc_name); goto error; } - log_msg(LVL_DEBUG, "Opened NIC '%s'", nic->svc_name); + log_msg(LOG_DEFAULT, LVL_DEBUG, "Opened NIC '%s'", nic->svc_name); list_append(&nic->nic_list, ðip_nic_list); in_list = true; @@ -188,7 +188,7 @@ static int ethip_nic_open(service_id_t sid) rc = nic_get_address(nic->sess, &nic_address); if (rc != EOK) { - log_msg(LVL_ERROR, "Error getting MAC address of NIC '%s'.", + log_msg(LOG_DEFAULT, LVL_ERROR, "Error getting MAC address of NIC '%s'.", nic->svc_name); goto error; } @@ -197,12 +197,12 @@ static int ethip_nic_open(service_id_t sid) rc = nic_set_state(nic->sess, NIC_STATE_ACTIVE); if (rc != EOK) { - log_msg(LVL_ERROR, "Error activating NIC '%s'.", + log_msg(LOG_DEFAULT, LVL_ERROR, "Error activating NIC '%s'.", nic->svc_name); goto error; } - log_msg(LVL_DEBUG, "Initialized IP link service, MAC = 0x%" PRIx64, + log_msg(LOG_DEFAULT, LVL_DEBUG, "Initialized IP link service, MAC = 0x%" PRIx64, nic->mac_addr.addr); return EOK; @@ -224,7 +224,7 @@ static void ethip_nic_cat_change_cb(void) static void ethip_nic_addr_changed(ethip_nic_t *nic, ipc_callid_t callid, ipc_call_t *call) { - log_msg(LVL_DEBUG, "ethip_nic_addr_changed()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_addr_changed()"); async_answer_0(callid, ENOTSUP); } @@ -235,30 +235,30 @@ static void ethip_nic_received(ethip_nic_t *nic, ipc_callid_t callid, void *data; size_t size; - log_msg(LVL_DEBUG, "ethip_nic_received() nic=%p", nic); + log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_received() nic=%p", nic); rc = async_data_write_accept(&data, false, 0, 0, 0, &size); if (rc != EOK) { - log_msg(LVL_DEBUG, "data_write_accept() failed"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "data_write_accept() failed"); return; } - log_msg(LVL_DEBUG, "Ethernet PDU contents (%zu bytes)", + log_msg(LOG_DEFAULT, LVL_DEBUG, "Ethernet PDU contents (%zu bytes)", size); - log_msg(LVL_DEBUG, "call ethip_received"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "call ethip_received"); rc = ethip_received(&nic->iplink, data, size); - log_msg(LVL_DEBUG, "free data"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "free data"); free(data); - log_msg(LVL_DEBUG, "ethip_nic_received() done, rc=%d", rc); + log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_received() done, rc=%d", rc); async_answer_0(callid, rc); } static void ethip_nic_device_state(ethip_nic_t *nic, ipc_callid_t callid, ipc_call_t *call) { - log_msg(LVL_DEBUG, "ethip_nic_device_state()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_device_state()"); async_answer_0(callid, ENOTSUP); } @@ -266,7 +266,7 @@ static void ethip_nic_cb_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg) { ethip_nic_t *nic = (ethip_nic_t *)arg; - log_msg(LVL_DEBUG, "ethnip_nic_cb_conn()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "ethnip_nic_cb_conn()"); while (true) { ipc_call_t call; @@ -297,7 +297,7 @@ int ethip_nic_discovery_start(void) { int rc = loc_register_cat_change_cb(ethip_nic_cat_change_cb); if (rc != EOK) { - log_msg(LVL_ERROR, "Failed registering callback for NIC " + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering callback for NIC " "discovery (%d).", rc); return rc; } @@ -307,30 +307,30 @@ int ethip_nic_discovery_start(void) ethip_nic_t *ethip_nic_find_by_iplink_sid(service_id_t iplink_sid) { - log_msg(LVL_DEBUG, "ethip_nic_find_by_iplink_sid(%u)", + log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_find_by_iplink_sid(%u)", (unsigned) iplink_sid); list_foreach(ethip_nic_list, link) { - log_msg(LVL_DEBUG, "ethip_nic_find_by_iplink_sid - element"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_find_by_iplink_sid - element"); ethip_nic_t *nic = list_get_instance(link, ethip_nic_t, nic_list); if (nic->iplink_sid == iplink_sid) { - log_msg(LVL_DEBUG, "ethip_nic_find_by_iplink_sid - found %p", nic); + log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_find_by_iplink_sid - found %p", nic); return nic; } } - log_msg(LVL_DEBUG, "ethip_nic_find_by_iplink_sid - not found"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_find_by_iplink_sid - not found"); return NULL; } int ethip_nic_send(ethip_nic_t *nic, void *data, size_t size) { int rc; - log_msg(LVL_DEBUG, "ethip_nic_send(size=%zu)", size); + log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_send(size=%zu)", size); rc = nic_send_frame(nic->sess, data, size); - log_msg(LVL_DEBUG, "nic_send_frame -> %d", rc); + log_msg(LOG_DEFAULT, LVL_DEBUG, "nic_send_frame -> %d", rc); return rc; } @@ -338,7 +338,7 @@ int ethip_nic_addr_add(ethip_nic_t *nic, iplink_srv_addr_t *addr) { ethip_link_addr_t *laddr; - log_msg(LVL_DEBUG, "ethip_nic_addr_add()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_addr_add()"); laddr = ethip_nic_addr_new(addr); if (laddr == NULL) return ENOMEM; @@ -351,7 +351,7 @@ int ethip_nic_addr_remove(ethip_nic_t *nic, iplink_srv_addr_t *addr) { ethip_link_addr_t *laddr; - log_msg(LVL_DEBUG, "ethip_nic_addr_remove()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_addr_remove()"); laddr = ethip_nic_addr_find(nic, addr); if (laddr == NULL) @@ -365,7 +365,7 @@ int ethip_nic_addr_remove(ethip_nic_t *nic, iplink_srv_addr_t *addr) ethip_link_addr_t *ethip_nic_addr_find(ethip_nic_t *nic, iplink_srv_addr_t *addr) { - log_msg(LVL_DEBUG, "ethip_nic_addr_find()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_addr_find()"); list_foreach(nic->addr_list, link) { ethip_link_addr_t *laddr = list_get_instance(link, diff --git a/uspace/srv/net/ethip/pdu.c b/uspace/srv/net/ethip/pdu.c index 2d92bdb7d..d0471f949 100644 --- a/uspace/srv/net/ethip/pdu.c +++ b/uspace/srv/net/ethip/pdu.c @@ -68,9 +68,9 @@ int eth_pdu_encode(eth_frame_t *frame, void **rdata, size_t *rsize) memcpy((uint8_t *)data + sizeof(eth_header_t), frame->data, frame->size); - log_msg(LVL_DEBUG, "Encoding Ethernet frame src=%llx dest=%llx etype=%x", + log_msg(LOG_DEFAULT, LVL_DEBUG, "Encoding Ethernet frame src=%llx dest=%llx etype=%x", frame->src, frame->dest, frame->etype_len); - log_msg(LVL_DEBUG, "Encoded Ethernet frame (%zu bytes)", size); + log_msg(LOG_DEFAULT, LVL_DEBUG, "Encoded Ethernet frame (%zu bytes)", size); *rdata = data; *rsize = size; @@ -82,10 +82,10 @@ int eth_pdu_decode(void *data, size_t size, eth_frame_t *frame) { eth_header_t *hdr; - log_msg(LVL_DEBUG, "eth_pdu_decode()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "eth_pdu_decode()"); if (size < sizeof(eth_header_t)) { - log_msg(LVL_DEBUG, "PDU too short (%zu)", size); + log_msg(LOG_DEFAULT, LVL_DEBUG, "PDU too short (%zu)", size); return EINVAL; } @@ -103,9 +103,9 @@ int eth_pdu_decode(void *data, size_t size, eth_frame_t *frame) memcpy(frame->data, (uint8_t *)data + sizeof(eth_header_t), frame->size); - log_msg(LVL_DEBUG, "Decoding Ethernet frame src=%llx dest=%llx etype=%x", + log_msg(LOG_DEFAULT, LVL_DEBUG, "Decoding Ethernet frame src=%llx dest=%llx etype=%x", frame->src, frame->dest, frame->etype_len); - log_msg(LVL_DEBUG, "Decoded Ethernet frame payload (%zu bytes)", frame->size); + log_msg(LOG_DEFAULT, LVL_DEBUG, "Decoded Ethernet frame payload (%zu bytes)", frame->size); return EOK; } @@ -142,7 +142,7 @@ int arp_pdu_encode(arp_eth_packet_t *packet, void **rdata, size_t *rsize) arp_eth_packet_fmt_t *pfmt; uint16_t fopcode; - log_msg(LVL_DEBUG, "arp_pdu_encode()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "arp_pdu_encode()"); size = sizeof(arp_eth_packet_fmt_t); @@ -182,35 +182,35 @@ int arp_pdu_decode(void *data, size_t size, arp_eth_packet_t *packet) { arp_eth_packet_fmt_t *pfmt; - log_msg(LVL_DEBUG, "arp_pdu_decode()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "arp_pdu_decode()"); if (size < sizeof(arp_eth_packet_fmt_t)) { - log_msg(LVL_DEBUG, "ARP PDU too short (%zu)", size); + log_msg(LOG_DEFAULT, LVL_DEBUG, "ARP PDU too short (%zu)", size); return EINVAL; } pfmt = (arp_eth_packet_fmt_t *)data; if (uint16_t_be2host(pfmt->hw_addr_space) != AHRD_ETHERNET) { - log_msg(LVL_DEBUG, "HW address space != %u (%" PRIu16 ")", + log_msg(LOG_DEFAULT, LVL_DEBUG, "HW address space != %u (%" PRIu16 ")", AHRD_ETHERNET, uint16_t_be2host(pfmt->hw_addr_space)); return EINVAL; } if (uint16_t_be2host(pfmt->proto_addr_space) != 0x0800) { - log_msg(LVL_DEBUG, "Proto address space != %u (%" PRIu16 ")", + log_msg(LOG_DEFAULT, LVL_DEBUG, "Proto address space != %u (%" PRIu16 ")", ETYPE_IP, uint16_t_be2host(pfmt->proto_addr_space)); return EINVAL; } if (pfmt->hw_addr_size != ETH_ADDR_SIZE) { - log_msg(LVL_DEBUG, "HW address size != %zu (%zu)", + log_msg(LOG_DEFAULT, LVL_DEBUG, "HW address size != %zu (%zu)", (size_t)ETH_ADDR_SIZE, (size_t)pfmt->hw_addr_size); return EINVAL; } if (pfmt->proto_addr_size != IPV4_ADDR_SIZE) { - log_msg(LVL_DEBUG, "Proto address size != %zu (%zu)", + log_msg(LOG_DEFAULT, LVL_DEBUG, "Proto address size != %zu (%zu)", (size_t)IPV4_ADDR_SIZE, (size_t)pfmt->proto_addr_size); return EINVAL; } @@ -219,7 +219,7 @@ int arp_pdu_decode(void *data, size_t size, arp_eth_packet_t *packet) case AOP_REQUEST: packet->opcode = aop_request; break; case AOP_REPLY: packet->opcode = aop_reply; break; default: - log_msg(LVL_DEBUG, "Invalid ARP opcode (%" PRIu16 ")", + log_msg(LOG_DEFAULT, LVL_DEBUG, "Invalid ARP opcode (%" PRIu16 ")", uint16_t_be2host(pfmt->opcode)); return EINVAL; } @@ -230,7 +230,7 @@ int arp_pdu_decode(void *data, size_t size, arp_eth_packet_t *packet) mac48_decode(pfmt->target_hw_addr, &packet->target_hw_addr); packet->target_proto_addr.ipv4 = uint32_t_be2host(pfmt->target_proto_addr); - log_msg(LVL_DEBUG, "packet->tpa = %x\n", pfmt->target_proto_addr); + log_msg(LOG_DEFAULT, LVL_DEBUG, "packet->tpa = %x\n", pfmt->target_proto_addr); return EOK; } diff --git a/uspace/srv/net/inetsrv/addrobj.c b/uspace/srv/net/inetsrv/addrobj.c index 9d0dfa07b..b3fc25fca 100644 --- a/uspace/srv/net/inetsrv/addrobj.c +++ b/uspace/srv/net/inetsrv/addrobj.c @@ -58,7 +58,7 @@ inet_addrobj_t *inet_addrobj_new(void) inet_addrobj_t *addr = calloc(1, sizeof(inet_addrobj_t)); if (addr == NULL) { - log_msg(LVL_ERROR, "Failed allocating address object. " + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed allocating address object. " "Out of memory."); return NULL; } @@ -113,7 +113,7 @@ inet_addrobj_t *inet_addrobj_find(inet_addr_t *addr, inet_addrobj_find_t find) { uint32_t mask; - log_msg(LVL_DEBUG, "inet_addrobj_find(%x)", (unsigned)addr->ipv4); + log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_addrobj_find(%x)", (unsigned)addr->ipv4); fibril_mutex_lock(&addr_list_lock); @@ -124,13 +124,13 @@ inet_addrobj_t *inet_addrobj_find(inet_addr_t *addr, inet_addrobj_find_t find) mask = inet_netmask(naddr->naddr.bits); if ((naddr->naddr.ipv4 & mask) == (addr->ipv4 & mask)) { fibril_mutex_unlock(&addr_list_lock); - log_msg(LVL_DEBUG, "inet_addrobj_find: found %p", + log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_addrobj_find: found %p", naddr); return naddr; } } - log_msg(LVL_DEBUG, "inet_addrobj_find: Not found"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_addrobj_find: Not found"); fibril_mutex_unlock(&addr_list_lock); return NULL; @@ -146,7 +146,7 @@ static inet_addrobj_t *inet_addrobj_find_by_name_locked(const char *name, inet_l { assert(fibril_mutex_is_locked(&addr_list_lock)); - log_msg(LVL_DEBUG, "inet_addrobj_find_by_name_locked('%s', '%s')", + log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_addrobj_find_by_name_locked('%s', '%s')", name, ilink->svc_name); list_foreach(addr_list, link) { @@ -154,13 +154,13 @@ static inet_addrobj_t *inet_addrobj_find_by_name_locked(const char *name, inet_l inet_addrobj_t, addr_list); if (naddr->ilink == ilink && str_cmp(naddr->name, name) == 0) { - log_msg(LVL_DEBUG, "inet_addrobj_find_by_name_locked: found %p", + log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_addrobj_find_by_name_locked: found %p", naddr); return naddr; } } - log_msg(LVL_DEBUG, "inet_addrobj_find_by_name_locked: Not found"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_addrobj_find_by_name_locked: Not found"); return NULL; } @@ -176,7 +176,7 @@ inet_addrobj_t *inet_addrobj_find_by_name(const char *name, inet_link_t *ilink) { inet_addrobj_t *aobj; - log_msg(LVL_DEBUG, "inet_addrobj_find_by_name('%s', '%s')", + log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_addrobj_find_by_name('%s', '%s')", name, ilink->svc_name); fibril_mutex_lock(&addr_list_lock); @@ -193,7 +193,7 @@ inet_addrobj_t *inet_addrobj_find_by_name(const char *name, inet_link_t *ilink) */ inet_addrobj_t *inet_addrobj_get_by_id(sysarg_t id) { - log_msg(LVL_DEBUG, "inet_addrobj_get_by_id(%zu)", (size_t)id); + log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_addrobj_get_by_id(%zu)", (size_t)id); fibril_mutex_lock(&addr_list_lock); diff --git a/uspace/srv/net/inetsrv/icmp.c b/uspace/srv/net/inetsrv/icmp.c index bfa9a7c41..5ff3fd988 100644 --- a/uspace/srv/net/inetsrv/icmp.c +++ b/uspace/srv/net/inetsrv/icmp.c @@ -56,7 +56,7 @@ int icmp_recv(inet_dgram_t *dgram) { uint8_t type; - log_msg(LVL_DEBUG, "icmp_recv()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "icmp_recv()"); if (dgram->size < 1) return EINVAL; @@ -83,7 +83,7 @@ static int icmp_recv_echo_request(inet_dgram_t *dgram) inet_dgram_t rdgram; int rc; - log_msg(LVL_DEBUG, "icmp_recv_echo_request()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "icmp_recv_echo_request()"); if (dgram->size < sizeof(icmp_echo_t)) return EINVAL; @@ -123,7 +123,7 @@ static int icmp_recv_echo_reply(inet_dgram_t *dgram) inetping_sdu_t sdu; uint16_t ident; - log_msg(LVL_DEBUG, "icmp_recv_echo_reply()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "icmp_recv_echo_reply()"); if (dgram->size < sizeof(icmp_echo_t)) return EINVAL; diff --git a/uspace/srv/net/inetsrv/inet_link.c b/uspace/srv/net/inetsrv/inet_link.c index 08c6dc6fb..313d0ddab 100644 --- a/uspace/srv/net/inetsrv/inet_link.c +++ b/uspace/srv/net/inetsrv/inet_link.c @@ -63,16 +63,16 @@ static int inet_iplink_recv(iplink_t *iplink, iplink_sdu_t *sdu) inet_packet_t packet; int rc; - log_msg(LVL_DEBUG, "inet_iplink_recv()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_iplink_recv()"); rc = inet_pdu_decode(sdu->data, sdu->size, &packet); if (rc != EOK) { - log_msg(LVL_DEBUG, "failed decoding PDU"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "failed decoding PDU"); return rc; } - log_msg(LVL_DEBUG, "call inet_recv_packet()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "call inet_recv_packet()"); rc = inet_recv_packet(&packet); - log_msg(LVL_DEBUG, "call inet_recv_packet -> %d", rc); + log_msg(LOG_DEFAULT, LVL_DEBUG, "call inet_recv_packet -> %d", rc); free(packet.data); return rc; @@ -90,14 +90,14 @@ static int inet_link_check_new(void) rc = loc_category_get_id("iplink", &iplink_cat, IPC_FLAG_BLOCKING); if (rc != EOK) { - log_msg(LVL_ERROR, "Failed resolving category 'iplink'."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed resolving category 'iplink'."); fibril_mutex_unlock(&inet_discovery_lock); return ENOENT; } rc = loc_category_get_svcs(iplink_cat, &svcs, &count); if (rc != EOK) { - log_msg(LVL_ERROR, "Failed getting list of IP links."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed getting list of IP links."); fibril_mutex_unlock(&inet_discovery_lock); return EIO; } @@ -115,11 +115,11 @@ static int inet_link_check_new(void) } if (!already_known) { - log_msg(LVL_DEBUG, "Found IP link '%lu'", + log_msg(LOG_DEFAULT, LVL_DEBUG, "Found IP link '%lu'", (unsigned long) svcs[i]); rc = inet_link_open(svcs[i]); if (rc != EOK) - log_msg(LVL_ERROR, "Could not open IP link."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Could not open IP link."); } } @@ -132,7 +132,7 @@ static inet_link_t *inet_link_new(void) inet_link_t *ilink = calloc(1, sizeof(inet_link_t)); if (ilink == NULL) { - log_msg(LVL_ERROR, "Failed allocating link structure. " + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed allocating link structure. " "Out of memory."); return NULL; } @@ -155,7 +155,7 @@ static int inet_link_open(service_id_t sid) iplink_addr_t iaddr; int rc; - log_msg(LVL_DEBUG, "inet_link_open()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_link_open()"); ilink = inet_link_new(); if (ilink == NULL) return ENOMEM; @@ -165,31 +165,31 @@ static int inet_link_open(service_id_t sid) rc = loc_service_get_name(sid, &ilink->svc_name); if (rc != EOK) { - log_msg(LVL_ERROR, "Failed getting service name."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed getting service name."); goto error; } ilink->sess = loc_service_connect(EXCHANGE_SERIALIZE, sid, 0); if (ilink->sess == NULL) { - log_msg(LVL_ERROR, "Failed connecting '%s'", ilink->svc_name); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed connecting '%s'", ilink->svc_name); goto error; } rc = iplink_open(ilink->sess, &inet_iplink_ev_ops, &ilink->iplink); if (rc != EOK) { - log_msg(LVL_ERROR, "Failed opening IP link '%s'", + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed opening IP link '%s'", ilink->svc_name); goto error; } rc = iplink_get_mtu(ilink->iplink, &ilink->def_mtu); if (rc != EOK) { - log_msg(LVL_ERROR, "Failed determinning MTU of link '%s'", + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed determinning MTU of link '%s'", ilink->svc_name); goto error; } - log_msg(LVL_DEBUG, "Opened IP link '%s'", ilink->svc_name); + log_msg(LOG_DEFAULT, LVL_DEBUG, "Opened IP link '%s'", ilink->svc_name); list_append(&ilink->link_list, &inet_link_list); inet_addrobj_t *addr; @@ -208,7 +208,7 @@ static int inet_link_open(service_id_t sid) addr->name = str_dup("v4a"); rc = inet_addrobj_add(addr); if (rc != EOK) { - log_msg(LVL_ERROR, "Failed setting IP address on internet link."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed setting IP address on internet link."); inet_addrobj_delete(addr); /* XXX Roll back */ return rc; @@ -217,7 +217,7 @@ static int inet_link_open(service_id_t sid) iaddr.ipv4 = addr->naddr.ipv4; rc = iplink_addr_add(ilink->iplink, &iaddr); if (rc != EOK) { - log_msg(LVL_ERROR, "Failed setting IP address on internet link."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed setting IP address on internet link."); inet_addrobj_remove(addr); inet_addrobj_delete(addr); /* XXX Roll back */ @@ -244,7 +244,7 @@ int inet_link_discovery_start(void) rc = loc_register_cat_change_cb(inet_link_cat_change_cb); if (rc != EOK) { - log_msg(LVL_ERROR, "Failed registering callback for IP link " + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering callback for IP link " "discovery (%d).", rc); return rc; } diff --git a/uspace/srv/net/inetsrv/inetcfg.c b/uspace/srv/net/inetsrv/inetcfg.c index 8b52a703e..419508f07 100644 --- a/uspace/srv/net/inetsrv/inetcfg.c +++ b/uspace/srv/net/inetsrv/inetcfg.c @@ -60,7 +60,7 @@ static int inetcfg_addr_create_static(char *name, inet_naddr_t *naddr, ilink = inet_link_get_by_id(link_id); if (ilink == NULL) { - log_msg(LVL_DEBUG, "Link %lu not found.", + log_msg(LOG_DEFAULT, LVL_DEBUG, "Link %lu not found.", (unsigned long) link_id); return ENOENT; } @@ -76,7 +76,7 @@ static int inetcfg_addr_create_static(char *name, inet_naddr_t *naddr, addr->name = str_dup(name); rc = inet_addrobj_add(addr); if (rc != EOK) { - log_msg(LVL_DEBUG, "Duplicate address name '%s'.", addr->name); + log_msg(LOG_DEFAULT, LVL_DEBUG, "Duplicate address name '%s'.", addr->name); inet_addrobj_delete(addr); return rc; } @@ -84,7 +84,7 @@ static int inetcfg_addr_create_static(char *name, inet_naddr_t *naddr, iaddr.ipv4 = addr->naddr.ipv4; rc = iplink_addr_add(ilink->iplink, &iaddr); if (rc != EOK) { - log_msg(LVL_ERROR, "Failed setting IP address on internet link."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed setting IP address on internet link."); inet_addrobj_remove(addr); inet_addrobj_delete(addr); return rc; @@ -129,13 +129,13 @@ static int inetcfg_addr_get_id(char *name, sysarg_t link_id, sysarg_t *addr_id) ilink = inet_link_get_by_id(link_id); if (ilink == NULL) { - log_msg(LVL_DEBUG, "Link %zu not found.", (size_t) link_id); + log_msg(LOG_DEFAULT, LVL_DEBUG, "Link %zu not found.", (size_t) link_id); return ENOENT; } addr = inet_addrobj_find_by_name(name, ilink); if (addr == NULL) { - log_msg(LVL_DEBUG, "Address '%s' not found.", name); + log_msg(LOG_DEFAULT, LVL_DEBUG, "Address '%s' not found.", name); return ENOENT; } @@ -227,7 +227,7 @@ static int inetcfg_sroute_get_id(char *name, sysarg_t *sroute_id) sroute = inet_sroute_find_by_name(name); if (sroute == NULL) { - log_msg(LVL_DEBUG, "Static route '%s' not found.", name); + log_msg(LOG_DEFAULT, LVL_DEBUG, "Static route '%s' not found.", name); return ENOENT; } @@ -244,7 +244,7 @@ static void inetcfg_addr_create_static_srv(ipc_callid_t callid, sysarg_t addr_id; int rc; - log_msg(LVL_DEBUG, "inetcfg_addr_create_static_srv()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_addr_create_static_srv()"); rc = async_data_write_accept((void **) &name, true, 0, LOC_NAME_MAXLEN, 0, NULL); @@ -268,7 +268,7 @@ static void inetcfg_addr_delete_srv(ipc_callid_t callid, ipc_call_t *call) sysarg_t addr_id; int rc; - log_msg(LVL_DEBUG, "inetcfg_addr_delete_srv()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_addr_delete_srv()"); addr_id = IPC_GET_ARG1(*call); @@ -286,7 +286,7 @@ static void inetcfg_addr_get_srv(ipc_callid_t callid, ipc_call_t *call) int rc; addr_id = IPC_GET_ARG1(*call); - log_msg(LVL_DEBUG, "inetcfg_addr_get_srv()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_addr_get_srv()"); ainfo.naddr.ipv4 = 0; ainfo.naddr.bits = 0; @@ -320,7 +320,7 @@ static void inetcfg_addr_get_id_srv(ipc_callid_t callid, ipc_call_t *call) sysarg_t addr_id; int rc; - log_msg(LVL_DEBUG, "inetcfg_addr_get_id_srv()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_addr_get_id_srv()"); link_id = IPC_GET_ARG1(*call); @@ -347,7 +347,7 @@ static void inetcfg_get_addr_list_srv(ipc_callid_t callid, ipc_call_t *call) sysarg_t *id_buf; int rc; - log_msg(LVL_DEBUG, "inetcfg_get_addr_list_srv()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_get_addr_list_srv()"); if (!async_data_read_receive(&rcallid, &max_size)) { async_answer_0(rcallid, EREFUSED); @@ -381,7 +381,7 @@ static void inetcfg_get_link_list_srv(ipc_callid_t callid, ipc_call_t *call) sysarg_t *id_buf; int rc; - log_msg(LVL_DEBUG, "inetcfg_get_link_list_srv()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_get_link_list_srv()"); if (!async_data_read_receive(&rcallid, &max_size)) { async_answer_0(rcallid, EREFUSED); @@ -414,7 +414,7 @@ static void inetcfg_get_sroute_list_srv(ipc_callid_t callid, ipc_call_t *call) sysarg_t *id_buf; int rc; - log_msg(LVL_DEBUG, "inetcfg_get_sroute_list_srv()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_get_sroute_list_srv()"); if (!async_data_read_receive(&rcallid, &max_size)) { async_answer_0(rcallid, EREFUSED); @@ -448,7 +448,7 @@ static void inetcfg_link_get_srv(ipc_callid_t callid, ipc_call_t *call) int rc; link_id = IPC_GET_ARG1(*call); - log_msg(LVL_DEBUG, "inetcfg_link_get_srv()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_link_get_srv()"); linfo.name = NULL; @@ -481,7 +481,7 @@ static void inetcfg_sroute_create_srv(ipc_callid_t callid, sysarg_t sroute_id; int rc; - log_msg(LVL_DEBUG, "inetcfg_sroute_create_srv()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_sroute_create_srv()"); rc = async_data_write_accept((void **) &name, true, 0, LOC_NAME_MAXLEN, 0, NULL); @@ -505,7 +505,7 @@ static void inetcfg_sroute_delete_srv(ipc_callid_t callid, ipc_call_t *call) sysarg_t sroute_id; int rc; - log_msg(LVL_DEBUG, "inetcfg_sroute_delete_srv()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_sroute_delete_srv()"); sroute_id = IPC_GET_ARG1(*call); @@ -523,7 +523,7 @@ static void inetcfg_sroute_get_srv(ipc_callid_t callid, ipc_call_t *call) int rc; sroute_id = IPC_GET_ARG1(*call); - log_msg(LVL_DEBUG, "inetcfg_sroute_get_srv()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_sroute_get_srv()"); srinfo.dest.ipv4 = 0; srinfo.dest.bits = 0; @@ -556,7 +556,7 @@ static void inetcfg_sroute_get_id_srv(ipc_callid_t callid, ipc_call_t *call) sysarg_t sroute_id; int rc; - log_msg(LVL_DEBUG, "inetcfg_sroute_get_id_srv()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_sroute_get_id_srv()"); rc = async_data_write_accept((void **) &name, true, 0, LOC_NAME_MAXLEN, 0, NULL); @@ -573,7 +573,7 @@ static void inetcfg_sroute_get_id_srv(ipc_callid_t callid, ipc_call_t *call) void inet_cfg_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg) { - log_msg(LVL_DEBUG, "inet_cfg_conn()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_cfg_conn()"); /* Accept the connection */ async_answer_0(iid, EOK); diff --git a/uspace/srv/net/inetsrv/inetping.c b/uspace/srv/net/inetsrv/inetping.c index c5ca8203d..0fd87e6a9 100644 --- a/uspace/srv/net/inetsrv/inetping.c +++ b/uspace/srv/net/inetsrv/inetping.c @@ -75,7 +75,7 @@ int inetping_recv(uint16_t ident, inetping_sdu_t *sdu) client = inetping_client_find(ident); if (client == NULL) { - log_msg(LVL_DEBUG, "Unknown ICMP ident. Dropping."); + log_msg(LOG_DEFAULT, LVL_DEBUG, "Unknown ICMP ident. Dropping."); return ENOENT; } @@ -106,7 +106,7 @@ static void inetping_send_srv(inetping_client_t *client, ipc_callid_t callid, inetping_sdu_t sdu; int rc; - log_msg(LVL_DEBUG, "inetping_send_srv()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "inetping_send_srv()"); rc = async_data_write_accept((void **) &sdu.data, false, 0, 0, 0, &sdu.size); @@ -132,7 +132,7 @@ static void inetping_get_srcaddr_srv(inetping_client_t *client, inet_addr_t local; int rc; - log_msg(LVL_DEBUG, "inetping_get_srcaddr_srv()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "inetping_get_srcaddr_srv()"); remote.ipv4 = IPC_GET_ARG1(*call); local.ipv4 = 0; @@ -191,7 +191,7 @@ void inetping_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg) inetping_client_t client; int rc; - log_msg(LVL_DEBUG, "inetping_conn()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "inetping_conn()"); /* Accept the connection */ async_answer_0(iid, EOK); diff --git a/uspace/srv/net/inetsrv/inetsrv.c b/uspace/srv/net/inetsrv/inetsrv.c index 7722d8b26..2fbcaa233 100644 --- a/uspace/srv/net/inetsrv/inetsrv.c +++ b/uspace/srv/net/inetsrv/inetsrv.c @@ -65,13 +65,13 @@ static LIST_INITIALIZE(client_list); static int inet_init(void) { - log_msg(LVL_DEBUG, "inet_init()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_init()"); async_set_client_connection(inet_client_conn); int rc = loc_server_register(NAME); if (rc != EOK) { - log_msg(LVL_ERROR, "Failed registering server (%d).", rc); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering server (%d).", rc); return EEXIST; } @@ -79,21 +79,21 @@ static int inet_init(void) rc = loc_service_register_with_iface(SERVICE_NAME_INET, &sid, INET_PORT_DEFAULT); if (rc != EOK) { - log_msg(LVL_ERROR, "Failed registering service (%d).", rc); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service (%d).", rc); return EEXIST; } rc = loc_service_register_with_iface(SERVICE_NAME_INETCFG, &sid, INET_PORT_CFG); if (rc != EOK) { - log_msg(LVL_ERROR, "Failed registering service (%d).", rc); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service (%d).", rc); return EEXIST; } rc = loc_service_register_with_iface(SERVICE_NAME_INETPING, &sid, INET_PORT_PING); if (rc != EOK) { - log_msg(LVL_ERROR, "Failed registering service (%d).", rc); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service (%d).", rc); return EEXIST; } @@ -107,7 +107,7 @@ static int inet_init(void) static void inet_callback_create_srv(inet_client_t *client, ipc_callid_t callid, ipc_call_t *call) { - log_msg(LVL_DEBUG, "inet_callback_create_srv()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_callback_create_srv()"); async_sess_t *sess = async_callback_receive(EXCHANGE_SERIALIZE); if (sess == NULL) { @@ -142,7 +142,7 @@ static int inet_find_dir(inet_addr_t *src, inet_addr_t *dest, uint8_t tos, } if (dir->aobj == NULL) { - log_msg(LVL_DEBUG, "inet_send: No route to destination."); + log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_send: No route to destination."); return ENOENT; } @@ -193,7 +193,7 @@ static void inet_get_srcaddr_srv(inet_client_t *client, ipc_callid_t callid, inet_addr_t local; int rc; - log_msg(LVL_DEBUG, "inet_get_srcaddr_srv()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_get_srcaddr_srv()"); remote.ipv4 = IPC_GET_ARG1(*call); tos = IPC_GET_ARG2(*call); @@ -211,7 +211,7 @@ static void inet_send_srv(inet_client_t *client, ipc_callid_t callid, int df; int rc; - log_msg(LVL_DEBUG, "inet_send_srv()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_send_srv()"); dgram.src.ipv4 = IPC_GET_ARG1(*call); dgram.dest.ipv4 = IPC_GET_ARG2(*call); @@ -237,7 +237,7 @@ static void inet_set_proto_srv(inet_client_t *client, ipc_callid_t callid, sysarg_t proto; proto = IPC_GET_ARG1(*call); - log_msg(LVL_DEBUG, "inet_set_proto_srv(%lu)", (unsigned long) proto); + log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_set_proto_srv(%lu)", (unsigned long) proto); if (proto > UINT8_MAX) { async_answer_0(callid, EINVAL); @@ -271,7 +271,7 @@ static void inet_default_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg) { inet_client_t client; - log_msg(LVL_DEBUG, "inet_default_conn()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_default_conn()"); /* Accept the connection */ async_answer_0(iid, EOK); @@ -377,7 +377,7 @@ int inet_recv_dgram_local(inet_dgram_t *dgram, uint8_t proto) { inet_client_t *client; - log_msg(LVL_DEBUG, "inet_recv_dgram_local()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_recv_dgram_local()"); /* ICMP messages are handled internally */ if (proto == IP_PROTO_ICMP) @@ -385,7 +385,7 @@ int inet_recv_dgram_local(inet_dgram_t *dgram, uint8_t proto) client = inet_client_find(proto); if (client == NULL) { - log_msg(LVL_DEBUG, "No client found for protocol 0x%" PRIx8, + log_msg(LOG_DEFAULT, LVL_DEBUG, "No client found for protocol 0x%" PRIx8, proto); return ENOENT; } diff --git a/uspace/srv/net/inetsrv/pdu.c b/uspace/srv/net/inetsrv/pdu.c index 0db40a490..933c0b03f 100644 --- a/uspace/srv/net/inetsrv/pdu.c +++ b/uspace/srv/net/inetsrv/pdu.c @@ -203,10 +203,10 @@ int inet_pdu_decode(void *data, size_t size, inet_packet_t *packet) uint16_t flags_foff; uint16_t foff; - log_msg(LVL_DEBUG, "inet_pdu_decode()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_pdu_decode()"); if (size < sizeof(ip_header_t)) { - log_msg(LVL_DEBUG, "PDU too short (%zu)", size); + log_msg(LOG_DEFAULT, LVL_DEBUG, "PDU too short (%zu)", size); return EINVAL; } @@ -215,18 +215,18 @@ int inet_pdu_decode(void *data, size_t size, inet_packet_t *packet) version = BIT_RANGE_EXTRACT(uint8_t, VI_VERSION_h, VI_VERSION_l, hdr->ver_ihl); if (version != 4) { - log_msg(LVL_DEBUG, "Version (%d) != 4", version); + log_msg(LOG_DEFAULT, LVL_DEBUG, "Version (%d) != 4", version); return EINVAL; } tot_len = uint16_t_be2host(hdr->tot_len); if (tot_len < sizeof(ip_header_t)) { - log_msg(LVL_DEBUG, "Total Length too small (%zu)", tot_len); + log_msg(LOG_DEFAULT, LVL_DEBUG, "Total Length too small (%zu)", tot_len); return EINVAL; } if (tot_len > size) { - log_msg(LVL_DEBUG, "Total Length = %zu > PDU size = %zu", + log_msg(LOG_DEFAULT, LVL_DEBUG, "Total Length = %zu > PDU size = %zu", tot_len, size); return EINVAL; } @@ -255,7 +255,7 @@ int inet_pdu_decode(void *data, size_t size, inet_packet_t *packet) packet->size = tot_len - data_offs; packet->data = calloc(packet->size, 1); if (packet->data == NULL) { - log_msg(LVL_WARN, "Out of memory."); + log_msg(LOG_DEFAULT, LVL_WARN, "Out of memory."); return ENOMEM; } diff --git a/uspace/srv/net/inetsrv/reass.c b/uspace/srv/net/inetsrv/reass.c index 173e345f8..7cb6871f5 100644 --- a/uspace/srv/net/inetsrv/reass.c +++ b/uspace/srv/net/inetsrv/reass.c @@ -85,7 +85,7 @@ int inet_reass_queue_packet(inet_packet_t *packet) reass_dgram_t *rdg; int rc; - log_msg(LVL_DEBUG, "inet_reass_queue_packet()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_reass_queue_packet()"); fibril_mutex_lock(&reass_dgram_map_lock); @@ -94,7 +94,7 @@ int inet_reass_queue_packet(inet_packet_t *packet) if (rdg == NULL) { /* Only happens when we are out of memory */ fibril_mutex_unlock(&reass_dgram_map_lock); - log_msg(LVL_DEBUG, "Allocation failed, packet dropped."); + log_msg(LOG_DEFAULT, LVL_DEBUG, "Allocation failed, packet dropped."); return ENOMEM; } diff --git a/uspace/srv/net/inetsrv/sroute.c b/uspace/srv/net/inetsrv/sroute.c index 4c464e6eb..5b0db0a72 100644 --- a/uspace/srv/net/inetsrv/sroute.c +++ b/uspace/srv/net/inetsrv/sroute.c @@ -56,7 +56,7 @@ inet_sroute_t *inet_sroute_new(void) inet_sroute_t *sroute = calloc(1, sizeof(inet_sroute_t)); if (sroute == NULL) { - log_msg(LVL_ERROR, "Failed allocating static route object. " + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed allocating static route object. " "Out of memory."); return NULL; } @@ -99,7 +99,7 @@ inet_sroute_t *inet_sroute_find(inet_addr_t *addr) uint32_t mask; inet_sroute_t *best; - log_msg(LVL_DEBUG, "inet_sroute_find(%x)", (unsigned)addr->ipv4); + log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_sroute_find(%x)", (unsigned)addr->ipv4); fibril_mutex_lock(&sroute_list_lock); @@ -116,13 +116,13 @@ inet_sroute_t *inet_sroute_find(inet_addr_t *addr) mask = inet_netmask(sroute->dest.bits); if ((sroute->dest.ipv4 & mask) == (addr->ipv4 & mask)) { fibril_mutex_unlock(&sroute_list_lock); - log_msg(LVL_DEBUG, "inet_sroute_find: found %p", + log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_sroute_find: found %p", sroute); return sroute; } } - log_msg(LVL_DEBUG, "inet_sroute_find: Not found"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_sroute_find: Not found"); fibril_mutex_unlock(&sroute_list_lock); return NULL; @@ -135,7 +135,7 @@ inet_sroute_t *inet_sroute_find(inet_addr_t *addr) */ inet_sroute_t *inet_sroute_find_by_name(const char *name) { - log_msg(LVL_DEBUG, "inet_sroute_find_by_name('%s')", + log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_sroute_find_by_name('%s')", name); fibril_mutex_lock(&sroute_list_lock); @@ -146,13 +146,13 @@ inet_sroute_t *inet_sroute_find_by_name(const char *name) if (str_cmp(sroute->name, name) == 0) { fibril_mutex_unlock(&sroute_list_lock); - log_msg(LVL_DEBUG, "inet_sroute_find_by_name: found %p", + log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_sroute_find_by_name: found %p", sroute); return sroute; } } - log_msg(LVL_DEBUG, "inet_sroute_find_by_name: Not found"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_sroute_find_by_name: Not found"); fibril_mutex_unlock(&sroute_list_lock); return NULL; @@ -165,7 +165,7 @@ inet_sroute_t *inet_sroute_find_by_name(const char *name) */ inet_sroute_t *inet_sroute_get_by_id(sysarg_t id) { - log_msg(LVL_DEBUG, "inet_sroute_get_by_id(%zu)", (size_t)id); + log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_sroute_get_by_id(%zu)", (size_t)id); fibril_mutex_lock(&sroute_list_lock); diff --git a/uspace/srv/net/loopip/loopip.c b/uspace/srv/net/loopip/loopip.c index 7c3f86752..e92b94fe0 100644 --- a/uspace/srv/net/loopip/loopip.c +++ b/uspace/srv/net/loopip/loopip.c @@ -74,7 +74,7 @@ typedef struct { static int loopip_recv_fibril(void *arg) { while (true) { - log_msg(LVL_DEBUG, "loopip_recv_fibril(): Wait for one item"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "loopip_recv_fibril(): Wait for one item"); link_t *link = prodcons_consume(&loopip_rcv_queue); rqueue_entry_t *rqe = list_get_instance(link, rqueue_entry_t, link); @@ -95,7 +95,7 @@ static int loopip_init(void) rc = loc_server_register(NAME); if (rc != EOK) { - log_msg(LVL_ERROR, "Failed registering server."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering server."); return rc; } @@ -107,19 +107,19 @@ static int loopip_init(void) rc = loc_service_register(svc_name, &sid); if (rc != EOK) { - log_msg(LVL_ERROR, "Failed registering service %s.", svc_name); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service %s.", svc_name); return rc; } rc = loc_category_get_id("iplink", &iplink_cat, IPC_FLAG_BLOCKING); if (rc != EOK) { - log_msg(LVL_ERROR, "Failed resolving category 'iplink'."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed resolving category 'iplink'."); return rc; } rc = loc_service_add_to_cat(sid, iplink_cat); if (rc != EOK) { - log_msg(LVL_ERROR, "Failed adding %s to category.", svc_name); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed adding %s to category.", svc_name); return rc; } @@ -134,19 +134,19 @@ static int loopip_init(void) static void loopip_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg) { - log_msg(LVL_DEBUG, "loopip_client_conn()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "loopip_client_conn()"); iplink_conn(iid, icall, &loopip_iplink); } static int loopip_open(iplink_srv_t *srv) { - log_msg(LVL_DEBUG, "loopip_open()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "loopip_open()"); return EOK; } static int loopip_close(iplink_srv_t *srv) { - log_msg(LVL_DEBUG, "loopip_close()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "loopip_close()"); return EOK; } @@ -154,7 +154,7 @@ static int loopip_send(iplink_srv_t *srv, iplink_srv_sdu_t *sdu) { rqueue_entry_t *rqe; - log_msg(LVL_DEBUG, "loopip_send()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "loopip_send()"); rqe = calloc(1, sizeof(rqueue_entry_t)); if (rqe == NULL) @@ -183,20 +183,20 @@ static int loopip_send(iplink_srv_t *srv, iplink_srv_sdu_t *sdu) static int loopip_get_mtu(iplink_srv_t *srv, size_t *mtu) { - log_msg(LVL_DEBUG, "loopip_get_mtu()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "loopip_get_mtu()"); *mtu = 1500; return EOK; } static int loopip_addr_add(iplink_srv_t *srv, iplink_srv_addr_t *addr) { - log_msg(LVL_DEBUG, "loopip_addr_add(0x%" PRIx32 ")", addr->ipv4); + log_msg(LOG_DEFAULT, LVL_DEBUG, "loopip_addr_add(0x%" PRIx32 ")", addr->ipv4); return EOK; } static int loopip_addr_remove(iplink_srv_t *srv, iplink_srv_addr_t *addr) { - log_msg(LVL_DEBUG, "loopip_addr_remove(0x%" PRIx32 ")", addr->ipv4); + log_msg(LOG_DEFAULT, LVL_DEBUG, "loopip_addr_remove(0x%" PRIx32 ")", addr->ipv4); return EOK; } diff --git a/uspace/srv/net/tcp/conn.c b/uspace/srv/net/tcp/conn.c index b36b11a56..abea1f4d0 100644 --- a/uspace/srv/net/tcp/conn.c +++ b/uspace/srv/net/tcp/conn.c @@ -163,7 +163,7 @@ error: */ static void tcp_conn_free(tcp_conn_t *conn) { - log_msg(LVL_DEBUG, "%s: tcp_conn_free(%p)", conn->name, conn); + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_conn_free(%p)", conn->name, conn); tcp_tqueue_fini(&conn->retransmit); if (conn->rcv_buf != NULL) @@ -183,7 +183,7 @@ static void tcp_conn_free(tcp_conn_t *conn) */ void tcp_conn_addref(tcp_conn_t *conn) { - log_msg(LVL_DEBUG2, "%s: tcp_conn_addref(%p)", conn->name, conn); + log_msg(LOG_DEFAULT, LVL_DEBUG2, "%s: tcp_conn_addref(%p)", conn->name, conn); atomic_inc(&conn->refcnt); } @@ -195,7 +195,7 @@ void tcp_conn_addref(tcp_conn_t *conn) */ void tcp_conn_delref(tcp_conn_t *conn) { - log_msg(LVL_DEBUG2, "%s: tcp_conn_delref(%p)", conn->name, conn); + log_msg(LOG_DEFAULT, LVL_DEBUG2, "%s: tcp_conn_delref(%p)", conn->name, conn); if (atomic_predec(&conn->refcnt) == 0) tcp_conn_free(conn); @@ -210,7 +210,7 @@ void tcp_conn_delref(tcp_conn_t *conn) */ void tcp_conn_delete(tcp_conn_t *conn) { - log_msg(LVL_DEBUG, "%s: tcp_conn_delete(%p)", conn->name, conn); + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_conn_delete(%p)", conn->name, conn); assert(conn->deleted == false); tcp_conn_delref(conn); @@ -244,7 +244,7 @@ static void tcp_conn_state_set(tcp_conn_t *conn, tcp_cstate_t nstate) { tcp_cstate_t old_state; - log_msg(LVL_DEBUG, "tcp_conn_state_set(%p)", conn); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_state_set(%p)", conn); old_state = conn->cstate; conn->cstate = nstate; @@ -252,10 +252,10 @@ static void tcp_conn_state_set(tcp_conn_t *conn, tcp_cstate_t nstate) /* Run user callback function */ if (conn->cstate_cb != NULL) { - log_msg(LVL_DEBUG, "tcp_conn_state_set() - run user CB"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_state_set() - run user CB"); conn->cstate_cb(conn, conn->cstate_cb_arg); } else { - log_msg(LVL_DEBUG, "tcp_conn_state_set() - no user CB"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_state_set() - no user CB"); } assert(old_state != st_closed); @@ -292,15 +292,15 @@ void tcp_conn_fin_sent(tcp_conn_t *conn) switch (conn->cstate) { case st_syn_received: case st_established: - log_msg(LVL_DEBUG, "%s: FIN sent -> Fin-Wait-1", conn->name); + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: FIN sent -> Fin-Wait-1", conn->name); tcp_conn_state_set(conn, st_fin_wait_1); break; case st_close_wait: - log_msg(LVL_DEBUG, "%s: FIN sent -> Last-Ack", conn->name); + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: FIN sent -> Last-Ack", conn->name); tcp_conn_state_set(conn, st_last_ack); break; default: - log_msg(LVL_ERROR, "%s: Connection state %d", conn->name, + log_msg(LOG_DEFAULT, LVL_ERROR, "%s: Connection state %d", conn->name, conn->cstate); assert(false); } @@ -311,7 +311,7 @@ void tcp_conn_fin_sent(tcp_conn_t *conn) /** Match socket with pattern. */ static bool tcp_socket_match(tcp_sock_t *sock, tcp_sock_t *patt) { - log_msg(LVL_DEBUG2, "tcp_socket_match(sock=(%x,%u), pat=(%x,%u))", + log_msg(LOG_DEFAULT, LVL_DEBUG2, "tcp_socket_match(sock=(%x,%u), pat=(%x,%u))", sock->addr.ipv4, sock->port, patt->addr.ipv4, patt->port); if (patt->addr.ipv4 != TCP_IPV4_ANY && @@ -322,7 +322,7 @@ static bool tcp_socket_match(tcp_sock_t *sock, tcp_sock_t *patt) patt->port != sock->port) return false; - log_msg(LVL_DEBUG2, " -> match"); + log_msg(LOG_DEFAULT, LVL_DEBUG2, " -> match"); return true; } @@ -330,7 +330,7 @@ static bool tcp_socket_match(tcp_sock_t *sock, tcp_sock_t *patt) /** Match socket pair with pattern. */ static bool tcp_sockpair_match(tcp_sockpair_t *sp, tcp_sockpair_t *pattern) { - log_msg(LVL_DEBUG2, "tcp_sockpair_match(%p, %p)", sp, pattern); + log_msg(LOG_DEFAULT, LVL_DEBUG2, "tcp_sockpair_match(%p, %p)", sp, pattern); if (!tcp_socket_match(&sp->local, &pattern->local)) return false; @@ -352,14 +352,14 @@ static bool tcp_sockpair_match(tcp_sockpair_t *sp, tcp_sockpair_t *pattern) */ tcp_conn_t *tcp_conn_find_ref(tcp_sockpair_t *sp) { - log_msg(LVL_DEBUG, "tcp_conn_find_ref(%p)", sp); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_find_ref(%p)", sp); fibril_mutex_lock(&conn_list_lock); list_foreach(conn_list, link) { tcp_conn_t *conn = list_get_instance(link, tcp_conn_t, link); tcp_sockpair_t *csp = &conn->ident; - log_msg(LVL_DEBUG2, "compare with conn (f:(%x,%u), l:(%x,%u))", + log_msg(LOG_DEFAULT, LVL_DEBUG2, "compare with conn (f:(%x,%u), l:(%x,%u))", csp->foreign.addr.ipv4, csp->foreign.port, csp->local.addr.ipv4, csp->local.port); if (tcp_sockpair_match(sp, csp)) { @@ -379,7 +379,7 @@ tcp_conn_t *tcp_conn_find_ref(tcp_sockpair_t *sp) */ static void tcp_conn_reset(tcp_conn_t *conn) { - log_msg(LVL_DEBUG, "%s: tcp_conn_reset()", conn->name); + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_conn_reset()", conn->name); tcp_conn_state_set(conn, st_closed); conn->reset = true; @@ -397,7 +397,7 @@ static void tcp_conn_reset(tcp_conn_t *conn) static void tcp_reset_signal(tcp_conn_t *conn) { /* TODO */ - log_msg(LVL_DEBUG, "%s: tcp_reset_signal()", conn->name); + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_reset_signal()", conn->name); } /** Determine if SYN has been received. @@ -421,7 +421,7 @@ bool tcp_conn_got_syn(tcp_conn_t *conn) case st_time_wait: return true; case st_closed: - log_msg(LVL_WARN, "state=%d", (int) conn->cstate); + log_msg(LOG_DEFAULT, LVL_WARN, "state=%d", (int) conn->cstate); assert(false); } @@ -435,34 +435,34 @@ bool tcp_conn_got_syn(tcp_conn_t *conn) */ static void tcp_conn_sa_listen(tcp_conn_t *conn, tcp_segment_t *seg) { - log_msg(LVL_DEBUG, "tcp_conn_sa_listen(%p, %p)", conn, seg); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_sa_listen(%p, %p)", conn, seg); if ((seg->ctrl & CTL_RST) != 0) { - log_msg(LVL_DEBUG, "Ignoring incoming RST."); + log_msg(LOG_DEFAULT, LVL_DEBUG, "Ignoring incoming RST."); return; } if ((seg->ctrl & CTL_ACK) != 0) { - log_msg(LVL_DEBUG, "Incoming ACK, send acceptable RST."); + log_msg(LOG_DEFAULT, LVL_DEBUG, "Incoming ACK, send acceptable RST."); tcp_reply_rst(&conn->ident, seg); return; } if ((seg->ctrl & CTL_SYN) == 0) { - log_msg(LVL_DEBUG, "SYN not present. Ignoring segment."); + log_msg(LOG_DEFAULT, LVL_DEBUG, "SYN not present. Ignoring segment."); return; } - log_msg(LVL_DEBUG, "Got SYN, sending SYN, ACK."); + log_msg(LOG_DEFAULT, LVL_DEBUG, "Got SYN, sending SYN, ACK."); conn->rcv_nxt = seg->seq + 1; conn->irs = seg->seq; - log_msg(LVL_DEBUG, "rcv_nxt=%u", conn->rcv_nxt); + log_msg(LOG_DEFAULT, LVL_DEBUG, "rcv_nxt=%u", conn->rcv_nxt); if (seg->len > 1) - log_msg(LVL_WARN, "SYN combined with data, ignoring data."); + log_msg(LOG_DEFAULT, LVL_WARN, "SYN combined with data, ignoring data."); /* XXX select ISS */ conn->iss = 1; @@ -492,17 +492,17 @@ static void tcp_conn_sa_listen(tcp_conn_t *conn, tcp_segment_t *seg) */ static void tcp_conn_sa_syn_sent(tcp_conn_t *conn, tcp_segment_t *seg) { - log_msg(LVL_DEBUG, "tcp_conn_sa_syn_sent(%p, %p)", conn, seg); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_sa_syn_sent(%p, %p)", conn, seg); if ((seg->ctrl & CTL_ACK) != 0) { - log_msg(LVL_DEBUG, "snd_una=%u, seg.ack=%u, snd_nxt=%u", + log_msg(LOG_DEFAULT, LVL_DEBUG, "snd_una=%u, seg.ack=%u, snd_nxt=%u", conn->snd_una, seg->ack, conn->snd_nxt); if (!seq_no_ack_acceptable(conn, seg->ack)) { if ((seg->ctrl & CTL_RST) == 0) { - log_msg(LVL_WARN, "ACK not acceptable, send RST"); + log_msg(LOG_DEFAULT, LVL_WARN, "ACK not acceptable, send RST"); tcp_reply_rst(&conn->ident, seg); } else { - log_msg(LVL_WARN, "RST,ACK not acceptable, drop"); + log_msg(LOG_DEFAULT, LVL_WARN, "RST,ACK not acceptable, drop"); } return; } @@ -511,13 +511,13 @@ static void tcp_conn_sa_syn_sent(tcp_conn_t *conn, tcp_segment_t *seg) if ((seg->ctrl & CTL_RST) != 0) { /* If we get here, we have either an acceptable ACK or no ACK */ if ((seg->ctrl & CTL_ACK) != 0) { - log_msg(LVL_DEBUG, "%s: Connection reset. -> Closed", + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: Connection reset. -> Closed", conn->name); /* Reset connection */ tcp_conn_reset(conn); return; } else { - log_msg(LVL_DEBUG, "%s: RST without ACK, drop", + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: RST without ACK, drop", conn->name); return; } @@ -526,7 +526,7 @@ static void tcp_conn_sa_syn_sent(tcp_conn_t *conn, tcp_segment_t *seg) /* XXX precedence */ if ((seg->ctrl & CTL_SYN) == 0) { - log_msg(LVL_DEBUG, "No SYN bit, ignoring segment."); + log_msg(LOG_DEFAULT, LVL_DEBUG, "No SYN bit, ignoring segment."); return; } @@ -543,25 +543,25 @@ static void tcp_conn_sa_syn_sent(tcp_conn_t *conn, tcp_segment_t *seg) tcp_tqueue_ack_received(conn); } - log_msg(LVL_DEBUG, "Sent SYN, got SYN."); + log_msg(LOG_DEFAULT, LVL_DEBUG, "Sent SYN, got SYN."); /* * Surprisingly the spec does not deal with initial window setting. * Set SND.WND = SEG.WND and set SND.WL1 so that next segment * will always be accepted as new window setting. */ - log_msg(LVL_DEBUG, "SND.WND := %" PRIu32 ", SND.WL1 := %" PRIu32 ", " + log_msg(LOG_DEFAULT, LVL_DEBUG, "SND.WND := %" PRIu32 ", SND.WL1 := %" PRIu32 ", " "SND.WL2 = %" PRIu32, seg->wnd, seg->seq, seg->seq); conn->snd_wnd = seg->wnd; conn->snd_wl1 = seg->seq; conn->snd_wl2 = seg->seq; if (seq_no_syn_acked(conn)) { - log_msg(LVL_DEBUG, "%s: syn acked -> Established", conn->name); + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: syn acked -> Established", conn->name); tcp_conn_state_set(conn, st_established); tcp_tqueue_ctrl_seg(conn, CTL_ACK /* XXX */); } else { - log_msg(LVL_DEBUG, "%s: syn not acked -> Syn-Received", + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: syn not acked -> Syn-Received", conn->name); tcp_conn_state_set(conn, st_syn_received); tcp_tqueue_ctrl_seg(conn, CTL_SYN | CTL_ACK /* XXX */); @@ -581,11 +581,11 @@ static void tcp_conn_sa_queue(tcp_conn_t *conn, tcp_segment_t *seg) { tcp_segment_t *pseg; - log_msg(LVL_DEBUG, "tcp_conn_sa_seq(%p, %p)", conn, seg); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_sa_seq(%p, %p)", conn, seg); /* Discard unacceptable segments ("old duplicates") */ if (!seq_no_segment_acceptable(conn, seg)) { - log_msg(LVL_DEBUG, "Replying ACK to unacceptable segment."); + log_msg(LOG_DEFAULT, LVL_DEBUG, "Replying ACK to unacceptable segment."); tcp_tqueue_ctrl_seg(conn, CTL_ACK); tcp_segment_delete(seg); return; @@ -681,7 +681,7 @@ static cproc_t tcp_conn_seg_proc_syn(tcp_conn_t *conn, tcp_segment_t *seg) */ assert(seq_no_in_rcv_wnd(conn, seg->seq)); - log_msg(LVL_WARN, "SYN is in receive window, should send reset. XXX"); + log_msg(LOG_DEFAULT, LVL_WARN, "SYN is in receive window, should send reset. XXX"); /* * TODO @@ -704,13 +704,13 @@ static cproc_t tcp_conn_seg_proc_ack_sr(tcp_conn_t *conn, tcp_segment_t *seg) { if (!seq_no_ack_acceptable(conn, seg->ack)) { /* ACK is not acceptable, send RST. */ - log_msg(LVL_WARN, "Segment ACK not acceptable, sending RST."); + log_msg(LOG_DEFAULT, LVL_WARN, "Segment ACK not acceptable, sending RST."); tcp_reply_rst(&conn->ident, seg); tcp_segment_delete(seg); return cp_done; } - log_msg(LVL_DEBUG, "%s: SYN ACKed -> Established", conn->name); + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: SYN ACKed -> Established", conn->name); tcp_conn_state_set(conn, st_established); @@ -729,23 +729,23 @@ static cproc_t tcp_conn_seg_proc_ack_sr(tcp_conn_t *conn, tcp_segment_t *seg) */ static cproc_t tcp_conn_seg_proc_ack_est(tcp_conn_t *conn, tcp_segment_t *seg) { - log_msg(LVL_DEBUG, "tcp_conn_seg_proc_ack_est(%p, %p)", conn, seg); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_seg_proc_ack_est(%p, %p)", conn, seg); - log_msg(LVL_DEBUG, "SEG.ACK=%u, SND.UNA=%u, SND.NXT=%u", + log_msg(LOG_DEFAULT, LVL_DEBUG, "SEG.ACK=%u, SND.UNA=%u, SND.NXT=%u", (unsigned)seg->ack, (unsigned)conn->snd_una, (unsigned)conn->snd_nxt); if (!seq_no_ack_acceptable(conn, seg->ack)) { - log_msg(LVL_DEBUG, "ACK not acceptable."); + log_msg(LOG_DEFAULT, LVL_DEBUG, "ACK not acceptable."); if (!seq_no_ack_duplicate(conn, seg->ack)) { - log_msg(LVL_WARN, "Not acceptable, not duplicate. " + log_msg(LOG_DEFAULT, LVL_WARN, "Not acceptable, not duplicate. " "Send ACK and drop."); /* Not acceptable, not duplicate. Send ACK and drop. */ tcp_tqueue_ctrl_seg(conn, CTL_ACK); tcp_segment_delete(seg); return cp_done; } else { - log_msg(LVL_DEBUG, "Ignoring duplicate ACK."); + log_msg(LOG_DEFAULT, LVL_DEBUG, "Ignoring duplicate ACK."); } } else { /* Update SND.UNA */ @@ -757,7 +757,7 @@ static cproc_t tcp_conn_seg_proc_ack_est(tcp_conn_t *conn, tcp_segment_t *seg) conn->snd_wl1 = seg->seq; conn->snd_wl2 = seg->ack; - log_msg(LVL_DEBUG, "Updating send window, SND.WND=%" PRIu32 + log_msg(LOG_DEFAULT, LVL_DEBUG, "Updating send window, SND.WND=%" PRIu32 ", SND.WL1=%" PRIu32 ", SND.WL2=%" PRIu32, conn->snd_wnd, conn->snd_wl1, conn->snd_wl2); } @@ -784,7 +784,7 @@ static cproc_t tcp_conn_seg_proc_ack_fw1(tcp_conn_t *conn, tcp_segment_t *seg) return cp_done; if (conn->fin_is_acked) { - log_msg(LVL_DEBUG, "%s: FIN acked -> Fin-Wait-2", conn->name); + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: FIN acked -> Fin-Wait-2", conn->name); tcp_conn_state_set(conn, st_fin_wait_2); } @@ -849,7 +849,7 @@ static cproc_t tcp_conn_seg_proc_ack_la(tcp_conn_t *conn, tcp_segment_t *seg) return cp_done; if (conn->fin_is_acked) { - log_msg(LVL_DEBUG, "%s: FIN acked -> Closed", conn->name); + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: FIN acked -> Closed", conn->name); tcp_conn_remove(conn); tcp_conn_state_set(conn, st_closed); return cp_done; @@ -880,11 +880,11 @@ static cproc_t tcp_conn_seg_proc_ack_tw(tcp_conn_t *conn, tcp_segment_t *seg) */ static cproc_t tcp_conn_seg_proc_ack(tcp_conn_t *conn, tcp_segment_t *seg) { - log_msg(LVL_DEBUG, "%s: tcp_conn_seg_proc_ack(%p, %p)", + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_conn_seg_proc_ack(%p, %p)", conn->name, conn, seg); if ((seg->ctrl & CTL_ACK) == 0) { - log_msg(LVL_WARN, "Segment has no ACK. Dropping."); + log_msg(LOG_DEFAULT, LVL_WARN, "Segment has no ACK. Dropping."); tcp_segment_delete(seg); return cp_done; } @@ -939,7 +939,7 @@ static cproc_t tcp_conn_seg_proc_text(tcp_conn_t *conn, tcp_segment_t *seg) size_t text_size; size_t xfer_size; - log_msg(LVL_DEBUG, "%s: tcp_conn_seg_proc_text(%p, %p)", + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_conn_seg_proc_text(%p, %p)", conn->name, conn, seg); switch (conn->cstate) { @@ -981,7 +981,7 @@ static cproc_t tcp_conn_seg_proc_text(tcp_conn_t *conn, tcp_segment_t *seg) /* Signal to the receive function that new data has arrived */ fibril_condvar_broadcast(&conn->rcv_buf_cv); - log_msg(LVL_DEBUG, "Received %zu bytes of data.", xfer_size); + log_msg(LOG_DEFAULT, LVL_DEBUG, "Received %zu bytes of data.", xfer_size); /* Advance RCV.NXT */ conn->rcv_nxt += xfer_size; @@ -997,7 +997,7 @@ static cproc_t tcp_conn_seg_proc_text(tcp_conn_t *conn, tcp_segment_t *seg) /* Trim part of segment which we just received */ tcp_conn_trim_seg_to_wnd(conn, seg); } else { - log_msg(LVL_DEBUG, "%s: Nothing left in segment, dropping " + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: Nothing left in segment, dropping " "(xfer_size=%zu, SEG.LEN=%zu, seg->ctrl=%u)", conn->name, xfer_size, seg->len, (unsigned)seg->ctrl); /* Nothing left in segment */ @@ -1017,14 +1017,14 @@ static cproc_t tcp_conn_seg_proc_text(tcp_conn_t *conn, tcp_segment_t *seg) */ static cproc_t tcp_conn_seg_proc_fin(tcp_conn_t *conn, tcp_segment_t *seg) { - log_msg(LVL_DEBUG, "%s: tcp_conn_seg_proc_fin(%p, %p)", + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_conn_seg_proc_fin(%p, %p)", conn->name, conn, seg); - log_msg(LVL_DEBUG, " seg->len=%zu, seg->ctl=%u", (size_t) seg->len, + log_msg(LOG_DEFAULT, LVL_DEBUG, " seg->len=%zu, seg->ctl=%u", (size_t) seg->len, (unsigned) seg->ctrl); /* Only process FIN if no text is left in segment. */ if (tcp_segment_text_size(seg) == 0 && (seg->ctrl & CTL_FIN) != 0) { - log_msg(LVL_DEBUG, " - FIN found in segment."); + log_msg(LOG_DEFAULT, LVL_DEBUG, " - FIN found in segment."); /* Send ACK */ tcp_tqueue_ctrl_seg(conn, CTL_ACK); @@ -1041,17 +1041,17 @@ static cproc_t tcp_conn_seg_proc_fin(tcp_conn_t *conn, tcp_segment_t *seg) assert(false); case st_syn_received: case st_established: - log_msg(LVL_DEBUG, "%s: FIN received -> Close-Wait", + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: FIN received -> Close-Wait", conn->name); tcp_conn_state_set(conn, st_close_wait); break; case st_fin_wait_1: - log_msg(LVL_DEBUG, "%s: FIN received -> Closing", + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: FIN received -> Closing", conn->name); tcp_conn_state_set(conn, st_closing); break; case st_fin_wait_2: - log_msg(LVL_DEBUG, "%s: FIN received -> Time-Wait", + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: FIN received -> Time-Wait", conn->name); tcp_conn_state_set(conn, st_time_wait); /* Start the Time-Wait timer */ @@ -1090,13 +1090,13 @@ static cproc_t tcp_conn_seg_proc_fin(tcp_conn_t *conn, tcp_segment_t *seg) */ static void tcp_conn_seg_process(tcp_conn_t *conn, tcp_segment_t *seg) { - log_msg(LVL_DEBUG, "tcp_conn_seg_process(%p, %p)", conn, seg); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_seg_process(%p, %p)", conn, seg); tcp_segment_dump(seg); /* Check whether segment is acceptable */ /* XXX Permit valid ACKs, URGs and RSTs */ /* if (!seq_no_segment_acceptable(conn, seg)) { - log_msg(LVL_WARN, "Segment not acceptable, dropping."); + log_msg(LOG_DEFAULT, LVL_WARN, "Segment not acceptable, dropping."); if ((seg->ctrl & CTL_RST) == 0) { tcp_tqueue_ctrl_seg(conn, CTL_ACK); } @@ -1130,7 +1130,7 @@ static void tcp_conn_seg_process(tcp_conn_t *conn, tcp_segment_t *seg) * incoming segments queue. */ if (seg->len > 0) { - log_msg(LVL_DEBUG, "Re-insert segment %p. seg->len=%zu", + log_msg(LOG_DEFAULT, LVL_DEBUG, "Re-insert segment %p. seg->len=%zu", seg, (size_t) seg->len); tcp_iqueue_insert_seg(&conn->incoming, seg); } else { @@ -1145,7 +1145,7 @@ static void tcp_conn_seg_process(tcp_conn_t *conn, tcp_segment_t *seg) */ void tcp_conn_segment_arrived(tcp_conn_t *conn, tcp_segment_t *seg) { - log_msg(LVL_DEBUG, "%c: tcp_conn_segment_arrived(%p)", + log_msg(LOG_DEFAULT, LVL_DEBUG, "%c: tcp_conn_segment_arrived(%p)", conn->name, seg); switch (conn->cstate) { @@ -1164,7 +1164,7 @@ void tcp_conn_segment_arrived(tcp_conn_t *conn, tcp_segment_t *seg) /* Process segments in order of sequence number */ tcp_conn_sa_queue(conn, seg); break; case st_closed: - log_msg(LVL_DEBUG, "state=%d", (int) conn->cstate); + log_msg(LOG_DEFAULT, LVL_DEBUG, "state=%d", (int) conn->cstate); assert(false); } } @@ -1177,18 +1177,18 @@ static void tw_timeout_func(void *arg) { tcp_conn_t *conn = (tcp_conn_t *) arg; - log_msg(LVL_DEBUG, "tw_timeout_func(%p)", conn); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tw_timeout_func(%p)", conn); fibril_mutex_lock(&conn->lock); if (conn->cstate == st_closed) { - log_msg(LVL_DEBUG, "Connection already closed."); + log_msg(LOG_DEFAULT, LVL_DEBUG, "Connection already closed."); fibril_mutex_unlock(&conn->lock); tcp_conn_delref(conn); return; } - log_msg(LVL_DEBUG, "%s: TW Timeout -> Closed", conn->name); + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: TW Timeout -> Closed", conn->name); tcp_conn_remove(conn); tcp_conn_state_set(conn, st_closed); @@ -1239,7 +1239,7 @@ void tcp_conn_trim_seg_to_wnd(tcp_conn_t *conn, tcp_segment_t *seg) */ void tcp_unexpected_segment(tcp_sockpair_t *sp, tcp_segment_t *seg) { - log_msg(LVL_DEBUG, "tcp_unexpected_segment(%p, %p)", sp, seg); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_unexpected_segment(%p, %p)", sp, seg); if ((seg->ctrl & CTL_RST) == 0) tcp_reply_rst(sp, seg); @@ -1267,7 +1267,7 @@ void tcp_reply_rst(tcp_sockpair_t *sp, tcp_segment_t *seg) { tcp_segment_t *rseg; - log_msg(LVL_DEBUG, "tcp_reply_rst(%p, %p)", sp, seg); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_reply_rst(%p, %p)", sp, seg); rseg = tcp_segment_make_rst(seg); tcp_transmit_segment(sp, rseg); diff --git a/uspace/srv/net/tcp/iqueue.c b/uspace/srv/net/tcp/iqueue.c index fa978e79b..4142caf7b 100644 --- a/uspace/srv/net/tcp/iqueue.c +++ b/uspace/srv/net/tcp/iqueue.c @@ -66,11 +66,11 @@ void tcp_iqueue_insert_seg(tcp_iqueue_t *iqueue, tcp_segment_t *seg) tcp_iqueue_entry_t *iqe; tcp_iqueue_entry_t *qe; link_t *link; - log_msg(LVL_DEBUG, "tcp_iqueue_insert_seg()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_iqueue_insert_seg()"); iqe = calloc(1, sizeof(tcp_iqueue_entry_t)); if (iqe == NULL) { - log_msg(LVL_ERROR, "Failed allocating IQE."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed allocating IQE."); return; } @@ -107,18 +107,18 @@ int tcp_iqueue_get_ready_seg(tcp_iqueue_t *iqueue, tcp_segment_t **seg) tcp_iqueue_entry_t *iqe; link_t *link; - log_msg(LVL_DEBUG, "tcp_get_ready_seg()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_get_ready_seg()"); link = list_first(&iqueue->list); if (link == NULL) { - log_msg(LVL_DEBUG, "iqueue is empty"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "iqueue is empty"); return ENOENT; } iqe = list_get_instance(link, tcp_iqueue_entry_t, link); while (!seq_no_segment_acceptable(iqueue->conn, iqe->seg)) { - log_msg(LVL_DEBUG, "Skipping unacceptable segment (RCV.NXT=%" + log_msg(LOG_DEFAULT, LVL_DEBUG, "Skipping unacceptable segment (RCV.NXT=%" PRIu32 ", RCV.NXT+RCV.WND=%" PRIu32 ", SEG.SEQ=%" PRIu32 ", SEG.LEN=%" PRIu32 ")", iqueue->conn->rcv_nxt, iqueue->conn->rcv_nxt + iqueue->conn->rcv_wnd, @@ -129,7 +129,7 @@ int tcp_iqueue_get_ready_seg(tcp_iqueue_t *iqueue, tcp_segment_t **seg) link = list_first(&iqueue->list); if (link == NULL) { - log_msg(LVL_DEBUG, "iqueue is empty"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "iqueue is empty"); return ENOENT; } @@ -138,13 +138,13 @@ int tcp_iqueue_get_ready_seg(tcp_iqueue_t *iqueue, tcp_segment_t **seg) /* Do not return segments that are not ready for processing */ if (!seq_no_segment_ready(iqueue->conn, iqe->seg)) { - log_msg(LVL_DEBUG, "Next segment not ready: SEG.SEQ=%u, " + log_msg(LOG_DEFAULT, LVL_DEBUG, "Next segment not ready: SEG.SEQ=%u, " "RCV.NXT=%u, SEG.LEN=%u", iqe->seg->seq, iqueue->conn->rcv_nxt, iqe->seg->len); return ENOENT; } - log_msg(LVL_DEBUG, "Returning ready segment %p", iqe->seg); + log_msg(LOG_DEFAULT, LVL_DEBUG, "Returning ready segment %p", iqe->seg); list_remove(&iqe->link); *seg = iqe->seg; diff --git a/uspace/srv/net/tcp/ncsim.c b/uspace/srv/net/tcp/ncsim.c index 96591d019..a997470a5 100644 --- a/uspace/srv/net/tcp/ncsim.c +++ b/uspace/srv/net/tcp/ncsim.c @@ -73,20 +73,20 @@ void tcp_ncsim_bounce_seg(tcp_sockpair_t *sp, tcp_segment_t *seg) tcp_squeue_entry_t *old_qe; link_t *link; - log_msg(LVL_DEBUG, "tcp_ncsim_bounce_seg()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_ncsim_bounce_seg()"); tcp_rqueue_bounce_seg(sp, seg); return; if (0 /*random() % 4 == 3*/) { /* Drop segment */ - log_msg(LVL_ERROR, "NCSim dropping segment"); + log_msg(LOG_DEFAULT, LVL_ERROR, "NCSim dropping segment"); tcp_segment_delete(seg); return; } sqe = calloc(1, sizeof(tcp_squeue_entry_t)); if (sqe == NULL) { - log_msg(LVL_ERROR, "Failed allocating SQE."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed allocating SQE."); return; } @@ -125,7 +125,7 @@ static int tcp_ncsim_fibril(void *arg) tcp_squeue_entry_t *sqe; int rc; - log_msg(LVL_DEBUG, "tcp_ncsim_fibril()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_ncsim_fibril()"); while (true) { @@ -138,7 +138,7 @@ static int tcp_ncsim_fibril(void *arg) link = list_first(&sim_queue); sqe = list_get_instance(link, tcp_squeue_entry_t, link); - log_msg(LVL_DEBUG, "NCSim - Sleep"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "NCSim - Sleep"); rc = fibril_condvar_wait_timeout(&sim_queue_cv, &sim_queue_lock, sqe->delay); } while (rc != ETIMEOUT); @@ -146,7 +146,7 @@ static int tcp_ncsim_fibril(void *arg) list_remove(link); fibril_mutex_unlock(&sim_queue_lock); - log_msg(LVL_DEBUG, "NCSim - End Sleep"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "NCSim - End Sleep"); tcp_rqueue_bounce_seg(&sqe->sp, sqe->seg); free(sqe); } @@ -160,11 +160,11 @@ void tcp_ncsim_fibril_start(void) { fid_t fid; - log_msg(LVL_DEBUG, "tcp_ncsim_fibril_start()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_ncsim_fibril_start()"); fid = fibril_create(tcp_ncsim_fibril, NULL); if (fid == 0) { - log_msg(LVL_ERROR, "Failed creating ncsim fibril."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed creating ncsim fibril."); return; } diff --git a/uspace/srv/net/tcp/rqueue.c b/uspace/srv/net/tcp/rqueue.c index 8b3317b31..89b6687bb 100644 --- a/uspace/srv/net/tcp/rqueue.c +++ b/uspace/srv/net/tcp/rqueue.c @@ -73,19 +73,19 @@ void tcp_rqueue_bounce_seg(tcp_sockpair_t *sp, tcp_segment_t *seg) { tcp_sockpair_t rident; - log_msg(LVL_DEBUG, "tcp_rqueue_bounce_seg()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_rqueue_bounce_seg()"); #ifdef BOUNCE_TRANSCODE tcp_pdu_t *pdu; tcp_segment_t *dseg; if (tcp_pdu_encode(sp, seg, &pdu) != EOK) { - log_msg(LVL_WARN, "Not enough memory. Segment dropped."); + log_msg(LOG_DEFAULT, LVL_WARN, "Not enough memory. Segment dropped."); return; } if (tcp_pdu_decode(pdu, &rident, &dseg) != EOK) { - log_msg(LVL_WARN, "Not enough memory. Segment dropped."); + log_msg(LOG_DEFAULT, LVL_WARN, "Not enough memory. Segment dropped."); return; } @@ -111,13 +111,13 @@ void tcp_rqueue_bounce_seg(tcp_sockpair_t *sp, tcp_segment_t *seg) void tcp_rqueue_insert_seg(tcp_sockpair_t *sp, tcp_segment_t *seg) { tcp_rqueue_entry_t *rqe; - log_msg(LVL_DEBUG, "tcp_rqueue_insert_seg()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_rqueue_insert_seg()"); tcp_segment_dump(seg); rqe = calloc(1, sizeof(tcp_rqueue_entry_t)); if (rqe == NULL) { - log_msg(LVL_ERROR, "Failed allocating RQE."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed allocating RQE."); return; } @@ -133,7 +133,7 @@ static int tcp_rqueue_fibril(void *arg) link_t *link; tcp_rqueue_entry_t *rqe; - log_msg(LVL_DEBUG, "tcp_rqueue_fibril()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_rqueue_fibril()"); while (true) { link = prodcons_consume(&rqueue); @@ -151,11 +151,11 @@ void tcp_rqueue_fibril_start(void) { fid_t fid; - log_msg(LVL_DEBUG, "tcp_rqueue_fibril_start()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_rqueue_fibril_start()"); fid = fibril_create(tcp_rqueue_fibril, NULL); if (fid == 0) { - log_msg(LVL_ERROR, "Failed creating rqueue fibril."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed creating rqueue fibril."); return; } diff --git a/uspace/srv/net/tcp/segment.c b/uspace/srv/net/tcp/segment.c index 210b7f534..93d243961 100644 --- a/uspace/srv/net/tcp/segment.c +++ b/uspace/srv/net/tcp/segment.c @@ -247,13 +247,13 @@ size_t tcp_segment_text_size(tcp_segment_t *seg) */ void tcp_segment_dump(tcp_segment_t *seg) { - log_msg(LVL_DEBUG2, "Segment dump:"); - log_msg(LVL_DEBUG2, " - ctrl = %u", (unsigned)seg->ctrl); - log_msg(LVL_DEBUG2, " - seq = % " PRIu32, seg->seq); - log_msg(LVL_DEBUG2, " - ack = % " PRIu32, seg->ack); - log_msg(LVL_DEBUG2, " - len = % " PRIu32, seg->len); - log_msg(LVL_DEBUG2, " - wnd = % " PRIu32, seg->wnd); - log_msg(LVL_DEBUG2, " - up = % " PRIu32, seg->up); + log_msg(LOG_DEFAULT, LVL_DEBUG2, "Segment dump:"); + log_msg(LOG_DEFAULT, LVL_DEBUG2, " - ctrl = %u", (unsigned)seg->ctrl); + log_msg(LOG_DEFAULT, LVL_DEBUG2, " - seq = % " PRIu32, seg->seq); + log_msg(LOG_DEFAULT, LVL_DEBUG2, " - ack = % " PRIu32, seg->ack); + log_msg(LOG_DEFAULT, LVL_DEBUG2, " - len = % " PRIu32, seg->len); + log_msg(LOG_DEFAULT, LVL_DEBUG2, " - wnd = % " PRIu32, seg->wnd); + log_msg(LOG_DEFAULT, LVL_DEBUG2, " - up = % " PRIu32, seg->up); } /** diff --git a/uspace/srv/net/tcp/sock.c b/uspace/srv/net/tcp/sock.c index 4a8085751..9edfc7e58 100644 --- a/uspace/srv/net/tcp/sock.c +++ b/uspace/srv/net/tcp/sock.c @@ -90,7 +90,7 @@ static void tcp_free_sock_data(socket_core_t *sock_core) static void tcp_sock_notify_data(socket_core_t *sock_core) { - log_msg(LVL_DEBUG, "tcp_sock_notify_data(%d)", sock_core->socket_id); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_notify_data(%d)", sock_core->socket_id); async_exch_t *exch = async_exchange_begin(sock_core->sess); async_msg_5(exch, NET_SOCKET_RECEIVED, (sysarg_t)sock_core->socket_id, TCP_SOCK_FRAGMENT_SIZE, 0, 0, 1); @@ -99,7 +99,7 @@ static void tcp_sock_notify_data(socket_core_t *sock_core) static void tcp_sock_notify_aconn(socket_core_t *lsock_core) { - log_msg(LVL_DEBUG, "tcp_sock_notify_aconn(%d)", lsock_core->socket_id); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_notify_aconn(%d)", lsock_core->socket_id); async_exch_t *exch = async_exchange_begin(lsock_core->sess); async_msg_5(exch, NET_SOCKET_ACCEPTED, (sysarg_t)lsock_core->socket_id, TCP_SOCK_FRAGMENT_SIZE, 0, 0, 0); @@ -110,7 +110,7 @@ static int tcp_sock_create(tcp_client_t *client, tcp_sockdata_t **rsock) { tcp_sockdata_t *sock; - log_msg(LVL_DEBUG, "tcp_sock_create()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_create()"); *rsock = NULL; sock = calloc(sizeof(tcp_sockdata_t), 1); @@ -132,7 +132,7 @@ static int tcp_sock_create(tcp_client_t *client, tcp_sockdata_t **rsock) static void tcp_sock_uncreate(tcp_sockdata_t *sock) { - log_msg(LVL_DEBUG, "tcp_sock_uncreate()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_uncreate()"); free(sock); } @@ -141,7 +141,7 @@ static int tcp_sock_finish_setup(tcp_sockdata_t *sock, int *sock_id) socket_core_t *sock_core; int rc; - log_msg(LVL_DEBUG, "tcp_sock_finish_setup()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_finish_setup()"); sock->recv_fibril = fibril_create(tcp_sock_recv_fibril, sock); if (sock->recv_fibril == 0) @@ -170,7 +170,7 @@ static void tcp_sock_socket(tcp_client_t *client, ipc_callid_t callid, ipc_call_ int rc; ipc_call_t answer; - log_msg(LVL_DEBUG, "tcp_sock_socket()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_socket()"); rc = tcp_sock_create(client, &sock); if (rc != EOK) { @@ -207,15 +207,15 @@ static void tcp_sock_bind(tcp_client_t *client, ipc_callid_t callid, ipc_call_t socket_core_t *sock_core; tcp_sockdata_t *socket; - log_msg(LVL_DEBUG, "tcp_sock_bind()"); - log_msg(LVL_DEBUG, " - async_data_write_accept"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_bind()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, " - async_data_write_accept"); rc = async_data_write_accept((void **) &addr, false, 0, 0, 0, &addr_len); if (rc != EOK) { async_answer_0(callid, rc); return; } - log_msg(LVL_DEBUG, " - call socket_bind"); + log_msg(LOG_DEFAULT, LVL_DEBUG, " - call socket_bind"); rc = socket_bind(&client->sockets, &gsock, SOCKET_GET_SOCKET_ID(call), addr, addr_len, TCP_FREE_PORTS_START, TCP_FREE_PORTS_END, last_used_port); @@ -224,7 +224,7 @@ static void tcp_sock_bind(tcp_client_t *client, ipc_callid_t callid, ipc_call_t return; } - log_msg(LVL_DEBUG, " - call socket_cores_find"); + log_msg(LOG_DEFAULT, LVL_DEBUG, " - call socket_cores_find"); sock_core = socket_cores_find(&client->sockets, SOCKET_GET_SOCKET_ID(call)); if (sock_core != NULL) { socket = (tcp_sockdata_t *)sock_core->specific_data; @@ -232,7 +232,7 @@ static void tcp_sock_bind(tcp_client_t *client, ipc_callid_t callid, ipc_call_t (void) socket; } - log_msg(LVL_DEBUG, " - success"); + log_msg(LOG_DEFAULT, LVL_DEBUG, " - success"); async_answer_0(callid, EOK); } @@ -249,7 +249,7 @@ static void tcp_sock_listen(tcp_client_t *client, ipc_callid_t callid, ipc_call_ tcp_sock_lconn_t *lconn; int i; - log_msg(LVL_DEBUG, "tcp_sock_listen()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_listen()"); socket_id = SOCKET_GET_SOCKET_ID(call); backlog = SOCKET_GET_BACKLOG(call); @@ -283,7 +283,7 @@ static void tcp_sock_listen(tcp_client_t *client, ipc_callid_t callid, ipc_call_ return; } - log_msg(LVL_DEBUG, " - open connections"); + log_msg(LOG_DEFAULT, LVL_DEBUG, " - open connections"); lsocket.addr.ipv4 = TCP_IPV4_ANY; lsocket.port = sock_core->port; @@ -336,7 +336,7 @@ static void tcp_sock_connect(tcp_client_t *client, ipc_callid_t callid, ipc_call tcp_sock_t lsocket; tcp_sock_t fsocket; - log_msg(LVL_DEBUG, "tcp_sock_connect()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_connect()"); rc = async_data_write_accept((void **) &addr, false, 0, 0, 0, &addr_len); if (rc != EOK || addr_len != sizeof(struct sockaddr_in)) { @@ -376,13 +376,13 @@ static void tcp_sock_connect(tcp_client_t *client, ipc_callid_t callid, ipc_call if (rc != EOK) { fibril_mutex_unlock(&socket->lock); async_answer_0(callid, rc); - log_msg(LVL_DEBUG, "tcp_sock_connect: Failed to " + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_connect: Failed to " "determine local address."); return; } socket->laddr.ipv4 = loc_addr.ipv4; - log_msg(LVL_DEBUG, "Local IP address is %x", socket->laddr.ipv4); + log_msg(LOG_DEFAULT, LVL_DEBUG, "Local IP address is %x", socket->laddr.ipv4); } lsocket.addr.ipv4 = socket->laddr.ipv4; @@ -430,7 +430,7 @@ static void tcp_sock_accept(tcp_client_t *client, ipc_callid_t callid, ipc_call_ tcp_sock_lconn_t *lconn; int rc; - log_msg(LVL_DEBUG, "tcp_sock_accept()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_accept()"); socket_id = SOCKET_GET_SOCKET_ID(call); asock_id = SOCKET_GET_NEW_SOCKET_ID(call); @@ -444,7 +444,7 @@ static void tcp_sock_accept(tcp_client_t *client, ipc_callid_t callid, ipc_call_ socket = (tcp_sockdata_t *)sock_core->specific_data; fibril_mutex_lock(&socket->lock); - log_msg(LVL_DEBUG, " - verify socket->conn"); + log_msg(LOG_DEFAULT, LVL_DEBUG, " - verify socket->conn"); if (socket->conn != NULL) { fibril_mutex_unlock(&socket->lock); async_answer_0(callid, EINVAL); @@ -497,7 +497,7 @@ static void tcp_sock_accept(tcp_client_t *client, ipc_callid_t callid, ipc_call_ } asocket->conn = conn; - log_msg(LVL_DEBUG, "tcp_sock_accept():create asocket\n"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_accept():create asocket\n"); rc = tcp_sock_finish_setup(asocket, &asock_id); if (rc != EOK) { @@ -509,7 +509,7 @@ static void tcp_sock_accept(tcp_client_t *client, ipc_callid_t callid, ipc_call_ fibril_add_ready(asocket->recv_fibril); - log_msg(LVL_DEBUG, "tcp_sock_accept(): find acore\n"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_accept(): find acore\n"); SOCKET_SET_DATA_FRAGMENT_SIZE(answer, TCP_SOCK_FRAGMENT_SIZE); SOCKET_SET_SOCKET_ID(answer, asock_id); @@ -520,7 +520,7 @@ static void tcp_sock_accept(tcp_client_t *client, ipc_callid_t callid, ipc_call_ IPC_GET_ARG3(answer)); /* Push one fragment notification to client's queue */ - log_msg(LVL_DEBUG, "tcp_sock_accept(): notify data\n"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_accept(): notify data\n"); fibril_mutex_unlock(&socket->lock); } @@ -538,7 +538,7 @@ static void tcp_sock_send(tcp_client_t *client, ipc_callid_t callid, ipc_call_t tcp_error_t trc; int rc; - log_msg(LVL_DEBUG, "tcp_sock_send()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_send()"); socket_id = SOCKET_GET_SOCKET_ID(call); fragments = SOCKET_GET_DATA_FRAGMENTS(call); SOCKET_GET_FLAGS(call); @@ -610,7 +610,7 @@ static void tcp_sock_send(tcp_client_t *client, ipc_callid_t callid, ipc_call_t static void tcp_sock_sendto(tcp_client_t *client, ipc_callid_t callid, ipc_call_t call) { - log_msg(LVL_DEBUG, "tcp_sock_sendto()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_sendto()"); async_answer_0(callid, ENOTSUP); } @@ -628,7 +628,7 @@ static void tcp_sock_recvfrom(tcp_client_t *client, ipc_callid_t callid, ipc_cal tcp_sock_t *rsock; int rc; - log_msg(LVL_DEBUG, "%p: tcp_sock_recv[from]()", client); + log_msg(LOG_DEFAULT, LVL_DEBUG, "%p: tcp_sock_recv[from]()", client); socket_id = SOCKET_GET_SOCKET_ID(call); flags = SOCKET_GET_FLAGS(call); @@ -650,15 +650,15 @@ static void tcp_sock_recvfrom(tcp_client_t *client, ipc_callid_t callid, ipc_cal (void)flags; - log_msg(LVL_DEBUG, "tcp_sock_recvfrom(): lock recv_buffer_lock"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_recvfrom(): lock recv_buffer_lock"); fibril_mutex_lock(&socket->recv_buffer_lock); while (socket->recv_buffer_used == 0 && socket->recv_error == TCP_EOK) { - log_msg(LVL_DEBUG, "wait for recv_buffer_cv + recv_buffer_used != 0"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "wait for recv_buffer_cv + recv_buffer_used != 0"); fibril_condvar_wait(&socket->recv_buffer_cv, &socket->recv_buffer_lock); } - log_msg(LVL_DEBUG, "Got data in sock recv_buffer"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "Got data in sock recv_buffer"); data_len = socket->recv_buffer_used; rc = socket->recv_error; @@ -678,7 +678,7 @@ static void tcp_sock_recvfrom(tcp_client_t *client, ipc_callid_t callid, ipc_cal assert(false); } - log_msg(LVL_DEBUG, "**** recv result -> %d", rc); + log_msg(LOG_DEFAULT, LVL_DEBUG, "**** recv result -> %d", rc); if (rc != EOK) { fibril_mutex_unlock(&socket->recv_buffer_lock); fibril_mutex_unlock(&socket->lock); @@ -693,7 +693,7 @@ static void tcp_sock_recvfrom(tcp_client_t *client, ipc_callid_t callid, ipc_cal addr.sin_addr.s_addr = host2uint32_t_be(rsock->addr.ipv4); addr.sin_port = host2uint16_t_be(rsock->port); - log_msg(LVL_DEBUG, "addr read receive"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "addr read receive"); if (!async_data_read_receive(&rcallid, &addr_length)) { fibril_mutex_unlock(&socket->recv_buffer_lock); fibril_mutex_unlock(&socket->lock); @@ -704,7 +704,7 @@ static void tcp_sock_recvfrom(tcp_client_t *client, ipc_callid_t callid, ipc_cal if (addr_length > sizeof(addr)) addr_length = sizeof(addr); - log_msg(LVL_DEBUG, "addr read finalize"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "addr read finalize"); rc = async_data_read_finalize(rcallid, &addr, addr_length); if (rc != EOK) { fibril_mutex_unlock(&socket->recv_buffer_lock); @@ -714,7 +714,7 @@ static void tcp_sock_recvfrom(tcp_client_t *client, ipc_callid_t callid, ipc_cal } } - log_msg(LVL_DEBUG, "data read receive"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "data read receive"); if (!async_data_read_receive(&rcallid, &length)) { fibril_mutex_unlock(&socket->recv_buffer_lock); fibril_mutex_unlock(&socket->lock); @@ -725,11 +725,11 @@ static void tcp_sock_recvfrom(tcp_client_t *client, ipc_callid_t callid, ipc_cal if (length > data_len) length = data_len; - log_msg(LVL_DEBUG, "data read finalize"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "data read finalize"); rc = async_data_read_finalize(rcallid, socket->recv_buffer, length); socket->recv_buffer_used -= length; - log_msg(LVL_DEBUG, "tcp_sock_recvfrom: %zu left in buffer", + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_recvfrom: %zu left in buffer", socket->recv_buffer_used); if (socket->recv_buffer_used > 0) { memmove(socket->recv_buffer, socket->recv_buffer + length, @@ -757,7 +757,7 @@ static void tcp_sock_close(tcp_client_t *client, ipc_callid_t callid, ipc_call_t tcp_error_t trc; int rc; - log_msg(LVL_DEBUG, "tcp_sock_close()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_close()"); socket_id = SOCKET_GET_SOCKET_ID(call); sock_core = socket_cores_find(&client->sockets, socket_id); @@ -797,13 +797,13 @@ static void tcp_sock_close(tcp_client_t *client, ipc_callid_t callid, ipc_call_t static void tcp_sock_getsockopt(tcp_client_t *client, ipc_callid_t callid, ipc_call_t call) { - log_msg(LVL_DEBUG, "tcp_sock_getsockopt()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_getsockopt()"); async_answer_0(callid, ENOTSUP); } static void tcp_sock_setsockopt(tcp_client_t *client, ipc_callid_t callid, ipc_call_t call) { - log_msg(LVL_DEBUG, "tcp_sock_setsockopt()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_setsockopt()"); async_answer_0(callid, ENOTSUP); } @@ -814,7 +814,7 @@ static void tcp_sock_cstate_cb(tcp_conn_t *conn, void *arg) tcp_sock_lconn_t *lconn = (tcp_sock_lconn_t *)arg; tcp_sockdata_t *socket = lconn->socket; - log_msg(LVL_DEBUG, "tcp_sock_cstate_cb()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_cstate_cb()"); fibril_mutex_lock(&socket->lock); assert(conn == lconn->conn); @@ -827,7 +827,7 @@ static void tcp_sock_cstate_cb(tcp_conn_t *conn, void *arg) assert_link_not_used(&lconn->ready_list); list_append(&lconn->ready_list, &socket->ready); - log_msg(LVL_DEBUG, "tcp_sock_cstate_cb(): notify accept"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_cstate_cb(): notify accept"); /* Push one accept notification to client's queue */ tcp_sock_notify_aconn(socket->sock_core); @@ -841,12 +841,12 @@ static int tcp_sock_recv_fibril(void *arg) xflags_t xflags; tcp_error_t trc; - log_msg(LVL_DEBUG, "tcp_sock_recv_fibril()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_recv_fibril()"); fibril_mutex_lock(&sock->recv_buffer_lock); while (true) { - log_msg(LVL_DEBUG, "call tcp_uc_receive()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "call tcp_uc_receive()"); while (sock->recv_buffer_used != 0 && sock->sock_core != NULL) fibril_condvar_wait(&sock->recv_buffer_cv, &sock->recv_buffer_lock); @@ -862,7 +862,7 @@ static int tcp_sock_recv_fibril(void *arg) break; } - log_msg(LVL_DEBUG, "got data - broadcast recv_buffer_cv"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "got data - broadcast recv_buffer_cv"); sock->recv_buffer_used = data_len; fibril_condvar_broadcast(&sock->recv_buffer_cv); @@ -894,7 +894,7 @@ static void tcp_sock_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg) if (!IPC_GET_IMETHOD(call)) break; - log_msg(LVL_DEBUG, "tcp_sock_connection: METHOD=%d\n", + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_connection: METHOD=%d\n", (int)IPC_GET_IMETHOD(call)); switch (IPC_GET_IMETHOD(call)) { @@ -939,7 +939,7 @@ static void tcp_sock_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg) } /* Clean up */ - log_msg(LVL_DEBUG, "tcp_sock_connection: Clean up"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_connection: Clean up"); async_hangup(client.sess); socket_cores_release(NULL, &client.sockets, &gsock, tcp_free_sock_data); } diff --git a/uspace/srv/net/tcp/tcp.c b/uspace/srv/net/tcp/tcp.c index 2cb617bd9..97b0edf0c 100644 --- a/uspace/srv/net/tcp/tcp.c +++ b/uspace/srv/net/tcp/tcp.c @@ -68,14 +68,14 @@ static int tcp_inet_ev_recv(inet_dgram_t *dgram) uint8_t *pdu_raw; size_t pdu_raw_size; - log_msg(LVL_DEBUG, "tcp_inet_ev_recv()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_inet_ev_recv()"); pdu_raw = dgram->data; pdu_raw_size = dgram->size; /* Split into header and payload. */ - log_msg(LVL_DEBUG, "tcp_inet_ev_recv() - split header/payload"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_inet_ev_recv() - split header/payload"); tcp_pdu_t *pdu; size_t hdr_size; @@ -83,7 +83,7 @@ static int tcp_inet_ev_recv(inet_dgram_t *dgram) uint32_t data_offset; if (pdu_raw_size < sizeof(tcp_header_t)) { - log_msg(LVL_WARN, "pdu_raw_size = %zu < sizeof(tcp_header_t) = %zu", + log_msg(LOG_DEFAULT, LVL_WARN, "pdu_raw_size = %zu < sizeof(tcp_header_t) = %zu", pdu_raw_size, sizeof(tcp_header_t)); return EINVAL; } @@ -95,28 +95,28 @@ static int tcp_inet_ev_recv(inet_dgram_t *dgram) hdr_size = sizeof(uint32_t) * data_offset; if (pdu_raw_size < hdr_size) { - log_msg(LVL_WARN, "pdu_raw_size = %zu < hdr_size = %zu", + log_msg(LOG_DEFAULT, LVL_WARN, "pdu_raw_size = %zu < hdr_size = %zu", pdu_raw_size, hdr_size); return EINVAL; } if (hdr_size < sizeof(tcp_header_t)) { - log_msg(LVL_WARN, "hdr_size = %zu < sizeof(tcp_header_t) = %zu", + log_msg(LOG_DEFAULT, LVL_WARN, "hdr_size = %zu < sizeof(tcp_header_t) = %zu", hdr_size, sizeof(tcp_header_t)); return EINVAL; } - log_msg(LVL_DEBUG, "pdu_raw_size=%zu, hdr_size=%zu", + log_msg(LOG_DEFAULT, LVL_DEBUG, "pdu_raw_size=%zu, hdr_size=%zu", pdu_raw_size, hdr_size); pdu = tcp_pdu_create(pdu_raw, hdr_size, pdu_raw + hdr_size, pdu_raw_size - hdr_size); if (pdu == NULL) { - log_msg(LVL_WARN, "Failed creating PDU. Dropped."); + log_msg(LOG_DEFAULT, LVL_WARN, "Failed creating PDU. Dropped."); return ENOMEM; } pdu->src_addr.ipv4 = dgram->src.ipv4; pdu->dest_addr.ipv4 = dgram->dest.ipv4; - log_msg(LVL_DEBUG, "src: 0x%08x, dest: 0x%08x", + log_msg(LOG_DEFAULT, LVL_DEBUG, "src: 0x%08x, dest: 0x%08x", pdu->src_addr.ipv4, pdu->dest_addr.ipv4); tcp_received_pdu(pdu); @@ -136,7 +136,7 @@ void tcp_transmit_pdu(tcp_pdu_t *pdu) pdu_raw_size = pdu->header_size + pdu->text_size; pdu_raw = malloc(pdu_raw_size); if (pdu_raw == NULL) { - log_msg(LVL_ERROR, "Failed to transmit PDU. Out of memory."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed to transmit PDU. Out of memory."); return; } @@ -152,7 +152,7 @@ void tcp_transmit_pdu(tcp_pdu_t *pdu) rc = inet_send(&dgram, INET_TTL_MAX, 0); if (rc != EOK) - log_msg(LVL_ERROR, "Failed to transmit PDU."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed to transmit PDU."); } /** Process received PDU. */ @@ -161,10 +161,10 @@ static void tcp_received_pdu(tcp_pdu_t *pdu) tcp_segment_t *dseg; tcp_sockpair_t rident; - log_msg(LVL_DEBUG, "tcp_received_pdu()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_received_pdu()"); if (tcp_pdu_decode(pdu, &rident, &dseg) != EOK) { - log_msg(LVL_WARN, "Not enough memory. PDU dropped."); + log_msg(LOG_DEFAULT, LVL_WARN, "Not enough memory. PDU dropped."); return; } @@ -176,7 +176,7 @@ static int tcp_init(void) { int rc; - log_msg(LVL_DEBUG, "tcp_init()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_init()"); tcp_rqueue_init(); tcp_rqueue_fibril_start(); @@ -188,13 +188,13 @@ static int tcp_init(void) rc = inet_init(IP_PROTO_TCP, &tcp_inet_ev_ops); if (rc != EOK) { - log_msg(LVL_ERROR, "Failed connecting to internet service."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed connecting to internet service."); return ENOENT; } rc = tcp_sock_init(); if (rc != EOK) { - log_msg(LVL_ERROR, "Failed initializing socket service."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed initializing socket service."); return ENOENT; } diff --git a/uspace/srv/net/tcp/tqueue.c b/uspace/srv/net/tcp/tqueue.c index 044956ebf..a8087b2da 100644 --- a/uspace/srv/net/tcp/tqueue.c +++ b/uspace/srv/net/tcp/tqueue.c @@ -87,7 +87,7 @@ void tcp_tqueue_ctrl_seg(tcp_conn_t *conn, tcp_control_t ctrl) { tcp_segment_t *seg; - log_msg(LVL_DEBUG, "tcp_tqueue_ctrl_seg(%p, %u)", conn, ctrl); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_tqueue_ctrl_seg(%p, %u)", conn, ctrl); seg = tcp_segment_make_ctrl(ctrl); tcp_tqueue_seg(conn, seg); @@ -98,7 +98,7 @@ void tcp_tqueue_seg(tcp_conn_t *conn, tcp_segment_t *seg) tcp_segment_t *rt_seg; tcp_tqueue_entry_t *tqe; - log_msg(LVL_DEBUG, "%s: tcp_tqueue_seg(%p, %p)", conn->name, conn, + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_tqueue_seg(%p, %p)", conn->name, conn, seg); /* @@ -108,14 +108,14 @@ void tcp_tqueue_seg(tcp_conn_t *conn, tcp_segment_t *seg) if (seg->len > 0) { rt_seg = tcp_segment_dup(seg); if (rt_seg == NULL) { - log_msg(LVL_ERROR, "Memory allocation failed."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Memory allocation failed."); /* XXX Handle properly */ return; } tqe = calloc(1, sizeof(tcp_tqueue_entry_t)); if (tqe == NULL) { - log_msg(LVL_ERROR, "Memory allocation failed."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Memory allocation failed."); /* XXX Handle properly */ return; } @@ -164,14 +164,14 @@ void tcp_tqueue_new_data(tcp_conn_t *conn) tcp_segment_t *seg; - log_msg(LVL_DEBUG, "%s: tcp_tqueue_new_data()", conn->name); + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_tqueue_new_data()", conn->name); /* Number of free sequence numbers in send window */ avail_wnd = (conn->snd_una + conn->snd_wnd) - conn->snd_nxt; snd_buf_seqlen = conn->snd_buf_used + (conn->snd_buf_fin ? 1 : 0); xfer_seqlen = min(snd_buf_seqlen, avail_wnd); - log_msg(LVL_DEBUG, "%s: snd_buf_seqlen = %zu, SND.WND = %zu, " + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: snd_buf_seqlen = %zu, SND.WND = %zu, " "xfer_seqlen = %zu", conn->name, snd_buf_seqlen, conn->snd_wnd, xfer_seqlen); @@ -184,7 +184,7 @@ void tcp_tqueue_new_data(tcp_conn_t *conn) data_size = xfer_seqlen - (send_fin ? 1 : 0); if (send_fin) { - log_msg(LVL_DEBUG, "%s: Sending out FIN.", conn->name); + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: Sending out FIN.", conn->name); /* We are sending out FIN */ ctrl = CTL_FIN; } else { @@ -193,7 +193,7 @@ void tcp_tqueue_new_data(tcp_conn_t *conn) seg = tcp_segment_make_data(ctrl, conn->snd_buf, data_size); if (seg == NULL) { - log_msg(LVL_ERROR, "Memory allocation failure."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Memory allocation failure."); return; } @@ -222,7 +222,7 @@ void tcp_tqueue_ack_received(tcp_conn_t *conn) { link_t *cur, *next; - log_msg(LVL_DEBUG, "%s: tcp_tqueue_ack_received(%p)", conn->name, + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_tqueue_ack_received(%p)", conn->name, conn); cur = conn->retransmit.list.head.next; @@ -238,8 +238,8 @@ void tcp_tqueue_ack_received(tcp_conn_t *conn) list_remove(cur); if ((tqe->seg->ctrl & CTL_FIN) != 0) { - log_msg(LVL_DEBUG, "Fin has been acked"); - log_msg(LVL_DEBUG, "SND.UNA=%" PRIu32 + log_msg(LOG_DEFAULT, LVL_DEBUG, "Fin has been acked"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "SND.UNA=%" PRIu32 " SEG.SEQ=%" PRIu32 " SEG.LEN=%" PRIu32, conn->snd_una, tqe->seg->seq, tqe->seg->len); /* Our FIN has been acked */ @@ -266,7 +266,7 @@ void tcp_tqueue_ack_received(tcp_conn_t *conn) void tcp_conn_transmit_segment(tcp_conn_t *conn, tcp_segment_t *seg) { - log_msg(LVL_DEBUG, "%s: tcp_conn_transmit_segment(%p, %p)", + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_conn_transmit_segment(%p, %p)", conn->name, conn, seg); seg->wnd = conn->rcv_wnd; @@ -281,11 +281,11 @@ void tcp_conn_transmit_segment(tcp_conn_t *conn, tcp_segment_t *seg) void tcp_transmit_segment(tcp_sockpair_t *sp, tcp_segment_t *seg) { - log_msg(LVL_DEBUG, "tcp_transmit_segment(f:(%x,%u),l:(%x,%u), %p)", + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_transmit_segment(f:(%x,%u),l:(%x,%u), %p)", sp->foreign.addr.ipv4, sp->foreign.port, sp->local.addr.ipv4, sp->local.port, seg); - log_msg(LVL_DEBUG, "SEG.SEQ=%" PRIu32 ", SEG.WND=%" PRIu32, + log_msg(LOG_DEFAULT, LVL_DEBUG, "SEG.SEQ=%" PRIu32 ", SEG.WND=%" PRIu32, seg->seq, seg->wnd); tcp_segment_dump(seg); @@ -299,7 +299,7 @@ void tcp_transmit_segment(tcp_sockpair_t *sp, tcp_segment_t *seg) tcp_pdu_t *pdu; if (tcp_pdu_encode(sp, seg, &pdu) != EOK) { - log_msg(LVL_WARN, "Not enough memory. Segment dropped."); + log_msg(LOG_DEFAULT, LVL_WARN, "Not enough memory. Segment dropped."); return; } @@ -314,12 +314,12 @@ static void retransmit_timeout_func(void *arg) tcp_segment_t *rt_seg; link_t *link; - log_msg(LVL_DEBUG, "### %s: retransmit_timeout_func(%p)", conn->name, conn); + log_msg(LOG_DEFAULT, LVL_DEBUG, "### %s: retransmit_timeout_func(%p)", conn->name, conn); fibril_mutex_lock(&conn->lock); if (conn->cstate == st_closed) { - log_msg(LVL_DEBUG, "Connection already closed."); + log_msg(LOG_DEFAULT, LVL_DEBUG, "Connection already closed."); fibril_mutex_unlock(&conn->lock); tcp_conn_delref(conn); return; @@ -327,7 +327,7 @@ static void retransmit_timeout_func(void *arg) link = list_first(&conn->retransmit.list); if (link == NULL) { - log_msg(LVL_DEBUG, "Nothing to retransmit"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "Nothing to retransmit"); fibril_mutex_unlock(&conn->lock); tcp_conn_delref(conn); return; @@ -337,14 +337,14 @@ static void retransmit_timeout_func(void *arg) rt_seg = tcp_segment_dup(tqe->seg); if (rt_seg == NULL) { - log_msg(LVL_ERROR, "Memory allocation failed."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Memory allocation failed."); fibril_mutex_unlock(&conn->lock); tcp_conn_delref(conn); /* XXX Handle properly */ return; } - log_msg(LVL_DEBUG, "### %s: retransmitting segment", conn->name); + log_msg(LOG_DEFAULT, LVL_DEBUG, "### %s: retransmitting segment", conn->name); tcp_conn_transmit_segment(tqe->conn, rt_seg); /* Reset retransmission timer */ @@ -357,7 +357,7 @@ static void retransmit_timeout_func(void *arg) /** Set or re-set retransmission timer */ static void tcp_tqueue_timer_set(tcp_conn_t *conn) { - log_msg(LVL_DEBUG, "### %s: tcp_tqueue_timer_set()", conn->name); + log_msg(LOG_DEFAULT, LVL_DEBUG, "### %s: tcp_tqueue_timer_set()", conn->name); /* Clear first to make sure we update refcnt correctly */ tcp_tqueue_timer_clear(conn); @@ -370,7 +370,7 @@ static void tcp_tqueue_timer_set(tcp_conn_t *conn) /** Clear retransmission timer */ static void tcp_tqueue_timer_clear(tcp_conn_t *conn) { - log_msg(LVL_DEBUG, "### %s: tcp_tqueue_timer_clear()", conn->name); + log_msg(LOG_DEFAULT, LVL_DEBUG, "### %s: tcp_tqueue_timer_clear()", conn->name); if (fibril_timer_clear(conn->retransmit.timer) == fts_active) tcp_conn_delref(conn); diff --git a/uspace/srv/net/tcp/ucall.c b/uspace/srv/net/tcp/ucall.c index 0c6918647..a08082538 100644 --- a/uspace/srv/net/tcp/ucall.c +++ b/uspace/srv/net/tcp/ucall.c @@ -69,7 +69,7 @@ tcp_error_t tcp_uc_open(tcp_sock_t *lsock, tcp_sock_t *fsock, acpass_t acpass, { tcp_conn_t *nconn; - log_msg(LVL_DEBUG, "tcp_uc_open(%p, %p, %s, %s, %p)", + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_uc_open(%p, %p, %s, %s, %p)", lsock, fsock, acpass == ap_active ? "active" : "passive", oflags == tcp_open_nonblock ? "nonblock" : "none", conn); @@ -87,7 +87,7 @@ tcp_error_t tcp_uc_open(tcp_sock_t *lsock, tcp_sock_t *fsock, acpass_t acpass, } /* Wait for connection to be established or reset */ - log_msg(LVL_DEBUG, "tcp_uc_open: Wait for connection."); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_uc_open: Wait for connection."); fibril_mutex_lock(&nconn->lock); while (nconn->cstate == st_listen || nconn->cstate == st_syn_sent || @@ -96,17 +96,17 @@ tcp_error_t tcp_uc_open(tcp_sock_t *lsock, tcp_sock_t *fsock, acpass_t acpass, } if (nconn->cstate != st_established) { - log_msg(LVL_DEBUG, "tcp_uc_open: Connection was reset."); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_uc_open: Connection was reset."); assert(nconn->cstate == st_closed); fibril_mutex_unlock(&nconn->lock); return TCP_ERESET; } fibril_mutex_unlock(&nconn->lock); - log_msg(LVL_DEBUG, "tcp_uc_open: Connection was established."); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_uc_open: Connection was established."); *conn = nconn; - log_msg(LVL_DEBUG, "tcp_uc_open -> %p", nconn); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_uc_open -> %p", nconn); return TCP_EOK; } @@ -117,7 +117,7 @@ tcp_error_t tcp_uc_send(tcp_conn_t *conn, void *data, size_t size, size_t buf_free; size_t xfer_size; - log_msg(LVL_DEBUG, "%s: tcp_uc_send()", conn->name); + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_uc_send()", conn->name); fibril_mutex_lock(&conn->lock); @@ -140,7 +140,7 @@ tcp_error_t tcp_uc_send(tcp_conn_t *conn, void *data, size_t size, while (size > 0) { buf_free = conn->snd_buf_size - conn->snd_buf_used; while (buf_free == 0 && !conn->reset) { - log_msg(LVL_DEBUG, "%s: buf_free == 0, waiting.", + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: buf_free == 0, waiting.", conn->name); fibril_condvar_wait(&conn->snd_buf_cv, &conn->lock); buf_free = conn->snd_buf_size - conn->snd_buf_used; @@ -174,7 +174,7 @@ tcp_error_t tcp_uc_receive(tcp_conn_t *conn, void *buf, size_t size, { size_t xfer_size; - log_msg(LVL_DEBUG, "%s: tcp_uc_receive()", conn->name); + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_uc_receive()", conn->name); fibril_mutex_lock(&conn->lock); @@ -185,7 +185,7 @@ tcp_error_t tcp_uc_receive(tcp_conn_t *conn, void *buf, size_t size, /* Wait for data to become available */ while (conn->rcv_buf_used == 0 && !conn->rcv_buf_fin && !conn->reset) { - log_msg(LVL_DEBUG, "tcp_uc_receive() - wait for data"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_uc_receive() - wait for data"); fibril_condvar_wait(&conn->rcv_buf_cv, &conn->lock); } @@ -222,7 +222,7 @@ tcp_error_t tcp_uc_receive(tcp_conn_t *conn, void *buf, size_t size, /* Send new size of receive window */ tcp_tqueue_ctrl_seg(conn, CTL_ACK); - log_msg(LVL_DEBUG, "%s: tcp_uc_receive() - returning %zu bytes", + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_uc_receive() - returning %zu bytes", conn->name, xfer_size); fibril_mutex_unlock(&conn->lock); @@ -233,7 +233,7 @@ tcp_error_t tcp_uc_receive(tcp_conn_t *conn, void *buf, size_t size, /** CLOSE user call */ tcp_error_t tcp_uc_close(tcp_conn_t *conn) { - log_msg(LVL_DEBUG, "%s: tcp_uc_close()", conn->name); + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_uc_close()", conn->name); fibril_mutex_lock(&conn->lock); @@ -257,13 +257,13 @@ tcp_error_t tcp_uc_close(tcp_conn_t *conn) /** ABORT user call */ void tcp_uc_abort(tcp_conn_t *conn) { - log_msg(LVL_DEBUG, "tcp_uc_abort()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_uc_abort()"); } /** STATUS user call */ void tcp_uc_status(tcp_conn_t *conn, tcp_conn_status_t *cstatus) { - log_msg(LVL_DEBUG, "tcp_uc_status()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_uc_status()"); cstatus->cstate = conn->cstate; } @@ -275,13 +275,13 @@ void tcp_uc_status(tcp_conn_t *conn, tcp_conn_status_t *cstatus) */ void tcp_uc_delete(tcp_conn_t *conn) { - log_msg(LVL_DEBUG, "tcp_uc_delete()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_uc_delete()"); tcp_conn_delete(conn); } void tcp_uc_set_cstate_cb(tcp_conn_t *conn, tcp_cstate_cb_t cb, void *arg) { - log_msg(LVL_DEBUG, "tcp_uc_set_ctate_cb(%p, %p, %p)", + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_uc_set_ctate_cb(%p, %p, %p)", conn, cb, arg); conn->cstate_cb = cb; @@ -297,13 +297,13 @@ void tcp_as_segment_arrived(tcp_sockpair_t *sp, tcp_segment_t *seg) { tcp_conn_t *conn; - log_msg(LVL_DEBUG, "tcp_as_segment_arrived(f:(%x,%u), l:(%x,%u))", + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_as_segment_arrived(f:(%x,%u), l:(%x,%u))", sp->foreign.addr.ipv4, sp->foreign.port, sp->local.addr.ipv4, sp->local.port); conn = tcp_conn_find_ref(sp); if (conn == NULL) { - log_msg(LVL_WARN, "No connection found."); + log_msg(LOG_DEFAULT, LVL_WARN, "No connection found."); tcp_unexpected_segment(sp, seg); return; } @@ -311,7 +311,7 @@ void tcp_as_segment_arrived(tcp_sockpair_t *sp, tcp_segment_t *seg) fibril_mutex_lock(&conn->lock); if (conn->cstate == st_closed) { - log_msg(LVL_WARN, "Connection is closed."); + log_msg(LOG_DEFAULT, LVL_WARN, "Connection is closed."); tcp_unexpected_segment(sp, seg); fibril_mutex_unlock(&conn->lock); tcp_conn_delref(conn); @@ -338,7 +338,7 @@ void tcp_as_segment_arrived(tcp_sockpair_t *sp, tcp_segment_t *seg) /** User timeout */ void tcp_to_user(void) { - log_msg(LVL_DEBUG, "tcp_to_user()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_to_user()"); } /** diff --git a/uspace/srv/net/udp/assoc.c b/uspace/srv/net/udp/assoc.c index e986f2c5b..fdf95d587 100644 --- a/uspace/srv/net/udp/assoc.c +++ b/uspace/srv/net/udp/assoc.c @@ -103,7 +103,7 @@ error: */ static void udp_assoc_free(udp_assoc_t *assoc) { - log_msg(LVL_DEBUG, "%s: udp_assoc_free(%p)", assoc->name, assoc); + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: udp_assoc_free(%p)", assoc->name, assoc); while (!list_empty(&assoc->rcv_queue)) { link_t *link = list_first(&assoc->rcv_queue); @@ -126,7 +126,7 @@ static void udp_assoc_free(udp_assoc_t *assoc) */ void udp_assoc_addref(udp_assoc_t *assoc) { - log_msg(LVL_DEBUG, "%s: upd_assoc_addref(%p)", assoc->name, assoc); + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: upd_assoc_addref(%p)", assoc->name, assoc); atomic_inc(&assoc->refcnt); } @@ -138,7 +138,7 @@ void udp_assoc_addref(udp_assoc_t *assoc) */ void udp_assoc_delref(udp_assoc_t *assoc) { - log_msg(LVL_DEBUG, "%s: udp_assoc_delref(%p)", assoc->name, assoc); + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: udp_assoc_delref(%p)", assoc->name, assoc); if (atomic_predec(&assoc->refcnt) == 0) udp_assoc_free(assoc); @@ -153,7 +153,7 @@ void udp_assoc_delref(udp_assoc_t *assoc) */ void udp_assoc_delete(udp_assoc_t *assoc) { - log_msg(LVL_DEBUG, "%s: udp_assoc_delete(%p)", assoc->name, assoc); + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: udp_assoc_delete(%p)", assoc->name, assoc); assert(assoc->deleted == false); udp_assoc_delref(assoc); @@ -191,7 +191,7 @@ void udp_assoc_remove(udp_assoc_t *assoc) */ void udp_assoc_set_foreign(udp_assoc_t *assoc, udp_sock_t *fsock) { - log_msg(LVL_DEBUG, "udp_assoc_set_foreign(%p, %p)", assoc, fsock); + log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_set_foreign(%p, %p)", assoc, fsock); fibril_mutex_lock(&assoc->lock); assoc->ident.foreign = *fsock; fibril_mutex_unlock(&assoc->lock); @@ -204,7 +204,7 @@ void udp_assoc_set_foreign(udp_assoc_t *assoc, udp_sock_t *fsock) */ void udp_assoc_set_local(udp_assoc_t *assoc, udp_sock_t *lsock) { - log_msg(LVL_DEBUG, "udp_assoc_set_local(%p, %p)", assoc, lsock); + log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_set_local(%p, %p)", assoc, lsock); fibril_mutex_lock(&assoc->lock); assoc->ident.local = *lsock; fibril_mutex_unlock(&assoc->lock); @@ -227,7 +227,7 @@ int udp_assoc_send(udp_assoc_t *assoc, udp_sock_t *fsock, udp_msg_t *msg) udp_sockpair_t sp; int rc; - log_msg(LVL_DEBUG, "udp_assoc_send(%p, %p, %p)", + log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_send(%p, %p, %p)", assoc, fsock, msg); /* @a fsock can be used to override the foreign socket */ @@ -260,15 +260,15 @@ int udp_assoc_recv(udp_assoc_t *assoc, udp_msg_t **msg, udp_sock_t *fsock) link_t *link; udp_rcv_queue_entry_t *rqe; - log_msg(LVL_DEBUG, "udp_assoc_recv()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_recv()"); fibril_mutex_lock(&assoc->lock); while (list_empty(&assoc->rcv_queue)) { - log_msg(LVL_DEBUG, "udp_assoc_recv() - waiting"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_recv() - waiting"); fibril_condvar_wait(&assoc->rcv_queue_cv, &assoc->lock); } - log_msg(LVL_DEBUG, "udp_assoc_recv() - got a message"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_recv() - got a message"); link = list_first(&assoc->rcv_queue); rqe = list_get_instance(link, udp_rcv_queue_entry_t, link); list_remove(link); @@ -290,11 +290,11 @@ void udp_assoc_received(udp_sockpair_t *rsp, udp_msg_t *msg) udp_assoc_t *assoc; int rc; - log_msg(LVL_DEBUG, "udp_assoc_received(%p, %p)", rsp, msg); + log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_received(%p, %p)", rsp, msg); assoc = udp_assoc_find_ref(rsp); if (assoc == NULL) { - log_msg(LVL_DEBUG, "No association found. Message dropped."); + log_msg(LOG_DEFAULT, LVL_DEBUG, "No association found. Message dropped."); /* XXX Generate ICMP error. */ /* XXX Might propagate error directly by error return. */ return; @@ -302,7 +302,7 @@ void udp_assoc_received(udp_sockpair_t *rsp, udp_msg_t *msg) rc = udp_assoc_queue_msg(assoc, rsp, msg); if (rc != EOK) { - log_msg(LVL_DEBUG, "Out of memory. Message dropped."); + log_msg(LOG_DEFAULT, LVL_DEBUG, "Out of memory. Message dropped."); /* XXX Generate ICMP error? */ } } @@ -312,7 +312,7 @@ static int udp_assoc_queue_msg(udp_assoc_t *assoc, udp_sockpair_t *sp, { udp_rcv_queue_entry_t *rqe; - log_msg(LVL_DEBUG, "udp_assoc_queue_msg(%p, %p, %p)", + log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_queue_msg(%p, %p, %p)", assoc, sp, msg); rqe = calloc(1, sizeof(udp_rcv_queue_entry_t)); @@ -335,7 +335,7 @@ static int udp_assoc_queue_msg(udp_assoc_t *assoc, udp_sockpair_t *sp, /** Match socket with pattern. */ static bool udp_socket_match(udp_sock_t *sock, udp_sock_t *patt) { - log_msg(LVL_DEBUG, "udp_socket_match(sock=(%x,%u), pat=(%x,%u))", + log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_socket_match(sock=(%x,%u), pat=(%x,%u))", sock->addr.ipv4, sock->port, patt->addr.ipv4, patt->port); if (patt->addr.ipv4 != UDP_IPV4_ANY && @@ -346,7 +346,7 @@ static bool udp_socket_match(udp_sock_t *sock, udp_sock_t *patt) patt->port != sock->port) return false; - log_msg(LVL_DEBUG, " -> match"); + log_msg(LOG_DEFAULT, LVL_DEBUG, " -> match"); return true; } @@ -354,7 +354,7 @@ static bool udp_socket_match(udp_sock_t *sock, udp_sock_t *patt) /** Match socket pair with pattern. */ static bool udp_sockpair_match(udp_sockpair_t *sp, udp_sockpair_t *pattern) { - log_msg(LVL_DEBUG, "udp_sockpair_match(%p, %p)", sp, pattern); + log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_sockpair_match(%p, %p)", sp, pattern); if (!udp_socket_match(&sp->local, &pattern->local)) return false; @@ -362,7 +362,7 @@ static bool udp_sockpair_match(udp_sockpair_t *sp, udp_sockpair_t *pattern) if (!udp_socket_match(&sp->foreign, &pattern->foreign)) return false; - log_msg(LVL_DEBUG, "Socket pair matched."); + log_msg(LOG_DEFAULT, LVL_DEBUG, "Socket pair matched."); return true; } @@ -378,14 +378,14 @@ static bool udp_sockpair_match(udp_sockpair_t *sp, udp_sockpair_t *pattern) */ static udp_assoc_t *udp_assoc_find_ref(udp_sockpair_t *sp) { - log_msg(LVL_DEBUG, "udp_assoc_find_ref(%p)", sp); + log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_find_ref(%p)", sp); fibril_mutex_lock(&assoc_list_lock); list_foreach(assoc_list, link) { udp_assoc_t *assoc = list_get_instance(link, udp_assoc_t, link); udp_sockpair_t *asp = &assoc->ident; - log_msg(LVL_DEBUG, "compare with assoc (f:(%x,%u), l:(%x,%u))", + log_msg(LOG_DEFAULT, LVL_DEBUG, "compare with assoc (f:(%x,%u), l:(%x,%u))", asp->foreign.addr.ipv4, asp->foreign.port, asp->local.addr.ipv4, asp->local.port); @@ -394,7 +394,7 @@ static udp_assoc_t *udp_assoc_find_ref(udp_sockpair_t *sp) continue; if (udp_sockpair_match(sp, asp)) { - log_msg(LVL_DEBUG, "Returning assoc %p", assoc); + log_msg(LOG_DEFAULT, LVL_DEBUG, "Returning assoc %p", assoc); udp_assoc_addref(assoc); fibril_mutex_unlock(&assoc_list_lock); return assoc; diff --git a/uspace/srv/net/udp/sock.c b/uspace/srv/net/udp/sock.c index 4e412be2e..485bc2519 100644 --- a/uspace/srv/net/udp/sock.c +++ b/uspace/srv/net/udp/sock.c @@ -87,7 +87,7 @@ static void udp_free_sock_data(socket_core_t *sock_core) static void udp_sock_notify_data(socket_core_t *sock_core) { - log_msg(LVL_DEBUG, "udp_sock_notify_data(%d)", sock_core->socket_id); + log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_sock_notify_data(%d)", sock_core->socket_id); async_exch_t *exch = async_exchange_begin(sock_core->sess); async_msg_5(exch, NET_SOCKET_RECEIVED, (sysarg_t)sock_core->socket_id, UDP_FRAGMENT_SIZE, 0, 0, 1); @@ -102,7 +102,7 @@ static void udp_sock_socket(udp_client_t *client, ipc_callid_t callid, ipc_call_ int rc; ipc_call_t answer; - log_msg(LVL_DEBUG, "udp_sock_socket()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_sock_socket()"); sock = calloc(sizeof(udp_sockdata_t), 1); if (sock == NULL) { async_answer_0(callid, ENOMEM); @@ -166,8 +166,8 @@ static void udp_sock_bind(udp_client_t *client, ipc_callid_t callid, ipc_call_t udp_sock_t fsock; udp_error_t urc; - log_msg(LVL_DEBUG, "udp_sock_bind()"); - log_msg(LVL_DEBUG, " - async_data_write_accept"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_sock_bind()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, " - async_data_write_accept"); addr = NULL; @@ -177,7 +177,7 @@ static void udp_sock_bind(udp_client_t *client, ipc_callid_t callid, ipc_call_t goto out; } - log_msg(LVL_DEBUG, " - call socket_bind"); + log_msg(LOG_DEFAULT, LVL_DEBUG, " - call socket_bind"); rc = socket_bind(&client->sockets, &gsock, SOCKET_GET_SOCKET_ID(call), addr, addr_size, UDP_FREE_PORTS_START, UDP_FREE_PORTS_END, last_used_port); @@ -191,7 +191,7 @@ static void udp_sock_bind(udp_client_t *client, ipc_callid_t callid, ipc_call_t goto out; } - log_msg(LVL_DEBUG, " - call socket_cores_find"); + log_msg(LOG_DEFAULT, LVL_DEBUG, " - call socket_cores_find"); sock_core = socket_cores_find(&client->sockets, SOCKET_GET_SOCKET_ID(call)); if (sock_core == NULL) { async_answer_0(callid, ENOENT); @@ -221,7 +221,7 @@ static void udp_sock_bind(udp_client_t *client, ipc_callid_t callid, ipc_call_t assert(false); } - log_msg(LVL_DEBUG, " - success"); + log_msg(LOG_DEFAULT, LVL_DEBUG, " - success"); async_answer_0(callid, rc); out: if (addr != NULL) @@ -230,19 +230,19 @@ out: static void udp_sock_listen(udp_client_t *client, ipc_callid_t callid, ipc_call_t call) { - log_msg(LVL_DEBUG, "udp_sock_listen()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_sock_listen()"); async_answer_0(callid, ENOTSUP); } static void udp_sock_connect(udp_client_t *client, ipc_callid_t callid, ipc_call_t call) { - log_msg(LVL_DEBUG, "udp_sock_connect()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_sock_connect()"); async_answer_0(callid, ENOTSUP); } static void udp_sock_accept(udp_client_t *client, ipc_callid_t callid, ipc_call_t call) { - log_msg(LVL_DEBUG, "udp_sock_accept()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_sock_accept()"); async_answer_0(callid, ENOTSUP); } @@ -263,7 +263,7 @@ static void udp_sock_sendto(udp_client_t *client, ipc_callid_t callid, ipc_call_ udp_error_t urc; int rc; - log_msg(LVL_DEBUG, "udp_sock_send()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_sock_send()"); addr = NULL; @@ -322,13 +322,13 @@ static void udp_sock_sendto(udp_client_t *client, ipc_callid_t callid, ipc_call_ if (rc != EOK) { fibril_mutex_unlock(&socket->lock); async_answer_0(callid, rc); - log_msg(LVL_DEBUG, "udp_sock_sendto: Failed to " + log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_sock_sendto: Failed to " "determine local address."); return; } socket->assoc->ident.local.addr.ipv4 = loc_addr.ipv4; - log_msg(LVL_DEBUG, "Local IP address is %x", + log_msg(LOG_DEFAULT, LVL_DEBUG, "Local IP address is %x", socket->assoc->ident.local.addr.ipv4); } @@ -404,7 +404,7 @@ static void udp_sock_recvfrom(udp_client_t *client, ipc_callid_t callid, ipc_cal struct sockaddr_in addr; int rc; - log_msg(LVL_DEBUG, "%p: udp_sock_recv[from]()", client); + log_msg(LOG_DEFAULT, LVL_DEBUG, "%p: udp_sock_recv[from]()", client); socket_id = SOCKET_GET_SOCKET_ID(call); flags = SOCKET_GET_FLAGS(call); @@ -426,21 +426,21 @@ static void udp_sock_recvfrom(udp_client_t *client, ipc_callid_t callid, ipc_cal (void)flags; - log_msg(LVL_DEBUG, "udp_sock_recvfrom(): lock recv_buffer lock"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_sock_recvfrom(): lock recv_buffer lock"); fibril_mutex_lock(&socket->recv_buffer_lock); while (socket->recv_buffer_used == 0 && socket->recv_error == UDP_EOK) { - log_msg(LVL_DEBUG, "udp_sock_recvfrom(): wait for cv"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_sock_recvfrom(): wait for cv"); fibril_condvar_wait(&socket->recv_buffer_cv, &socket->recv_buffer_lock); } - log_msg(LVL_DEBUG, "Got data in sock recv_buffer"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "Got data in sock recv_buffer"); rsock = socket->recv_fsock; data_len = socket->recv_buffer_used; urc = socket->recv_error; - log_msg(LVL_DEBUG, "**** recv data_len=%zu", data_len); + log_msg(LOG_DEFAULT, LVL_DEBUG, "**** recv data_len=%zu", data_len); switch (urc) { case UDP_EOK: @@ -457,7 +457,7 @@ static void udp_sock_recvfrom(udp_client_t *client, ipc_callid_t callid, ipc_cal assert(false); } - log_msg(LVL_DEBUG, "**** udp_uc_receive -> %d", rc); + log_msg(LOG_DEFAULT, LVL_DEBUG, "**** udp_uc_receive -> %d", rc); if (rc != EOK) { fibril_mutex_unlock(&socket->recv_buffer_lock); fibril_mutex_unlock(&socket->lock); @@ -471,7 +471,7 @@ static void udp_sock_recvfrom(udp_client_t *client, ipc_callid_t callid, ipc_cal addr.sin_addr.s_addr = host2uint32_t_be(rsock.addr.ipv4); addr.sin_port = host2uint16_t_be(rsock.port); - log_msg(LVL_DEBUG, "addr read receive"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "addr read receive"); if (!async_data_read_receive(&rcallid, &addr_length)) { fibril_mutex_unlock(&socket->recv_buffer_lock); fibril_mutex_unlock(&socket->lock); @@ -482,7 +482,7 @@ static void udp_sock_recvfrom(udp_client_t *client, ipc_callid_t callid, ipc_cal if (addr_length > sizeof(addr)) addr_length = sizeof(addr); - log_msg(LVL_DEBUG, "addr read finalize"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "addr read finalize"); rc = async_data_read_finalize(rcallid, &addr, addr_length); if (rc != EOK) { fibril_mutex_unlock(&socket->recv_buffer_lock); @@ -492,7 +492,7 @@ static void udp_sock_recvfrom(udp_client_t *client, ipc_callid_t callid, ipc_cal } } - log_msg(LVL_DEBUG, "data read receive"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "data read receive"); if (!async_data_read_receive(&rcallid, &length)) { fibril_mutex_unlock(&socket->recv_buffer_lock); fibril_mutex_unlock(&socket->lock); @@ -503,13 +503,13 @@ static void udp_sock_recvfrom(udp_client_t *client, ipc_callid_t callid, ipc_cal if (length > data_len) length = data_len; - log_msg(LVL_DEBUG, "data read finalize"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "data read finalize"); rc = async_data_read_finalize(rcallid, socket->recv_buffer, length); if (length < data_len && rc == EOK) rc = EOVERFLOW; - log_msg(LVL_DEBUG, "read_data_length <- %zu", length); + log_msg(LOG_DEFAULT, LVL_DEBUG, "read_data_length <- %zu", length); IPC_SET_ARG2(answer, 0); SOCKET_SET_READ_DATA_LENGTH(answer, length); SOCKET_SET_ADDRESS_LENGTH(answer, sizeof(addr)); @@ -530,7 +530,7 @@ static void udp_sock_close(udp_client_t *client, ipc_callid_t callid, ipc_call_t udp_sockdata_t *socket; int rc; - log_msg(LVL_DEBUG, "tcp_sock_close()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_close()"); socket_id = SOCKET_GET_SOCKET_ID(call); sock_core = socket_cores_find(&client->sockets, socket_id); @@ -556,13 +556,13 @@ static void udp_sock_close(udp_client_t *client, ipc_callid_t callid, ipc_call_t static void udp_sock_getsockopt(udp_client_t *client, ipc_callid_t callid, ipc_call_t call) { - log_msg(LVL_DEBUG, "udp_sock_getsockopt()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_sock_getsockopt()"); async_answer_0(callid, ENOTSUP); } static void udp_sock_setsockopt(udp_client_t *client, ipc_callid_t callid, ipc_call_t call) { - log_msg(LVL_DEBUG, "udp_sock_setsockopt()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_sock_setsockopt()"); async_answer_0(callid, ENOTSUP); } @@ -573,17 +573,17 @@ static int udp_sock_recv_fibril(void *arg) xflags_t xflags; size_t rcvd; - log_msg(LVL_DEBUG, "udp_sock_recv_fibril()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_sock_recv_fibril()"); while (true) { - log_msg(LVL_DEBUG, "[] wait for rcv buffer empty()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "[] wait for rcv buffer empty()"); fibril_mutex_lock(&sock->recv_buffer_lock); while (sock->recv_buffer_used != 0) { fibril_condvar_wait(&sock->recv_buffer_cv, &sock->recv_buffer_lock); } - log_msg(LVL_DEBUG, "[] call udp_uc_receive()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "[] call udp_uc_receive()"); urc = udp_uc_receive(sock->assoc, sock->recv_buffer, UDP_FRAGMENT_SIZE, &rcvd, &xflags, &sock->recv_fsock); sock->recv_error = urc; @@ -596,7 +596,7 @@ static int udp_sock_recv_fibril(void *arg) break; } - log_msg(LVL_DEBUG, "[] got data - broadcast recv_buffer_cv"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "[] got data - broadcast recv_buffer_cv"); sock->recv_buffer_used = rcvd; fibril_mutex_unlock(&sock->recv_buffer_lock); @@ -621,12 +621,12 @@ static void udp_sock_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg) socket_cores_initialize(&client.sockets); while (true) { - log_msg(LVL_DEBUG, "udp_sock_connection: wait"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_sock_connection: wait"); callid = async_get_call(&call); if (!IPC_GET_IMETHOD(call)) break; - log_msg(LVL_DEBUG, "udp_sock_connection: METHOD=%d", + log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_sock_connection: METHOD=%d", (int)IPC_GET_IMETHOD(call)); switch (IPC_GET_IMETHOD(call)) { @@ -669,7 +669,7 @@ static void udp_sock_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg) } /* Clean up */ - log_msg(LVL_DEBUG, "udp_sock_connection: Clean up"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_sock_connection: Clean up"); async_hangup(client.sess); socket_cores_release(NULL, &client.sockets, &gsock, udp_free_sock_data); } diff --git a/uspace/srv/net/udp/ucall.c b/uspace/srv/net/udp/ucall.c index 740a04c8f..cd07fe337 100644 --- a/uspace/srv/net/udp/ucall.c +++ b/uspace/srv/net/udp/ucall.c @@ -46,7 +46,7 @@ udp_error_t udp_uc_create(udp_assoc_t **assoc) { udp_assoc_t *nassoc; - log_msg(LVL_DEBUG, "udp_uc_create()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_uc_create()"); nassoc = udp_assoc_new(NULL, NULL); if (nassoc == NULL) return UDP_ENORES; @@ -58,7 +58,7 @@ udp_error_t udp_uc_create(udp_assoc_t **assoc) udp_error_t udp_uc_set_foreign(udp_assoc_t *assoc, udp_sock_t *fsock) { - log_msg(LVL_DEBUG, "udp_uc_set_foreign(%p, %p)", assoc, fsock); + log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_uc_set_foreign(%p, %p)", assoc, fsock); udp_assoc_set_foreign(assoc, fsock); return UDP_EOK; @@ -66,7 +66,7 @@ udp_error_t udp_uc_set_foreign(udp_assoc_t *assoc, udp_sock_t *fsock) udp_error_t udp_uc_set_local(udp_assoc_t *assoc, udp_sock_t *lsock) { - log_msg(LVL_DEBUG, "udp_uc_set_local(%p, %p)", assoc, lsock); + log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_uc_set_local(%p, %p)", assoc, lsock); udp_assoc_set_local(assoc, lsock); return UDP_EOK; @@ -78,7 +78,7 @@ udp_error_t udp_uc_send(udp_assoc_t *assoc, udp_sock_t *fsock, void *data, int rc; udp_msg_t msg; - log_msg(LVL_DEBUG, "%s: udp_uc_send()", assoc->name); + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: udp_uc_send()", assoc->name); msg.data = data; msg.data_size = size; @@ -102,7 +102,7 @@ udp_error_t udp_uc_receive(udp_assoc_t *assoc, void *buf, size_t size, udp_msg_t *msg; int rc; - log_msg(LVL_DEBUG, "%s: udp_uc_receive()", assoc->name); + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: udp_uc_receive()", assoc->name); rc = udp_assoc_recv(assoc, &msg, fsock); switch (rc) { } @@ -117,13 +117,13 @@ udp_error_t udp_uc_receive(udp_assoc_t *assoc, void *buf, size_t size, void udp_uc_status(udp_assoc_t *assoc, udp_assoc_status_t *astatus) { - log_msg(LVL_DEBUG, "udp_uc_status()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_uc_status()"); // cstatus->cstate = conn->cstate; } void udp_uc_destroy(udp_assoc_t *assoc) { - log_msg(LVL_DEBUG, "udp_uc_destroy()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_uc_destroy()"); udp_assoc_remove(assoc); udp_assoc_delete(assoc); } diff --git a/uspace/srv/net/udp/udp.c b/uspace/srv/net/udp/udp.c index 9b4e1af36..2a4409701 100644 --- a/uspace/srv/net/udp/udp.c +++ b/uspace/srv/net/udp/udp.c @@ -49,17 +49,17 @@ static int udp_init(void) { int rc; - log_msg(LVL_DEBUG, "udp_init()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_init()"); rc = udp_inet_init(); if (rc != EOK) { - log_msg(LVL_ERROR, "Failed connecting to internet service."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed connecting to internet service."); return ENOENT; } rc = udp_sock_init(); if (rc != EOK) { - log_msg(LVL_ERROR, "Failed initializing socket service."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed initializing socket service."); return ENOENT; } diff --git a/uspace/srv/net/udp/udp_inet.c b/uspace/srv/net/udp/udp_inet.c index 7830927bd..48c45fa40 100644 --- a/uspace/srv/net/udp/udp_inet.c +++ b/uspace/srv/net/udp/udp_inet.c @@ -60,7 +60,7 @@ static int udp_inet_ev_recv(inet_dgram_t *dgram) { udp_pdu_t *pdu; - log_msg(LVL_DEBUG, "udp_inet_ev_recv()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_inet_ev_recv()"); pdu = udp_pdu_new(); pdu->data = dgram->data; @@ -68,7 +68,7 @@ static int udp_inet_ev_recv(inet_dgram_t *dgram) pdu->src.ipv4 = dgram->src.ipv4; pdu->dest.ipv4 = dgram->dest.ipv4; - log_msg(LVL_DEBUG, "src: 0x%08x, dest: 0x%08x", + log_msg(LOG_DEFAULT, LVL_DEBUG, "src: 0x%08x, dest: 0x%08x", pdu->src.ipv4, pdu->dest.ipv4); udp_received_pdu(pdu); @@ -83,7 +83,7 @@ int udp_transmit_pdu(udp_pdu_t *pdu) int rc; inet_dgram_t dgram; - log_msg(LVL_DEBUG, "udp_transmit_pdu()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_transmit_pdu()"); dgram.src.ipv4 = pdu->src.ipv4; dgram.dest.ipv4 = pdu->dest.ipv4; @@ -93,7 +93,7 @@ int udp_transmit_pdu(udp_pdu_t *pdu) rc = inet_send(&dgram, INET_TTL_MAX, 0); if (rc != EOK) - log_msg(LVL_ERROR, "Failed to transmit PDU."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed to transmit PDU."); return rc; } @@ -104,10 +104,10 @@ static void udp_received_pdu(udp_pdu_t *pdu) udp_msg_t *dmsg; udp_sockpair_t rident; - log_msg(LVL_DEBUG, "udp_received_pdu()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_received_pdu()"); if (udp_pdu_decode(pdu, &rident, &dmsg) != EOK) { - log_msg(LVL_WARN, "Not enough memory. PDU dropped."); + log_msg(LOG_DEFAULT, LVL_WARN, "Not enough memory. PDU dropped."); return; } @@ -123,11 +123,11 @@ int udp_inet_init(void) { int rc; - log_msg(LVL_DEBUG, "udp_inet_init()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_inet_init()"); rc = inet_init(IP_PROTO_UDP, &udp_inet_ev_ops); if (rc != EOK) { - log_msg(LVL_ERROR, "Failed connecting to internet service."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed connecting to internet service."); return ENOENT; } -- 2.11.4.GIT