Index: uspace/app/tester/stdio/logger1.c =================================================================== --- uspace/app/tester/stdio/logger1.c (revision 920d0fc6fcf84fd2fdbf02cb9004b0d38e32027e) +++ uspace/app/tester/stdio/logger1.c (revision a1a101df39387ef358e61b7a23da833e01376074) @@ -36,5 +36,5 @@ { 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); } Index: uspace/app/tester/stdio/logger2.c =================================================================== --- uspace/app/tester/stdio/logger2.c (revision 920d0fc6fcf84fd2fdbf02cb9004b0d38e32027e) +++ uspace/app/tester/stdio/logger2.c (revision a1a101df39387ef358e61b7a23da833e01376074) @@ -48,10 +48,10 @@ */ 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)); Index: uspace/drv/char/i8042/i8042.c =================================================================== --- uspace/drv/char/i8042/i8042.c (revision 920d0fc6fcf84fd2fdbf02cb9004b0d38e32027e) +++ uspace/drv/char/i8042/i8042.c (revision a1a101df39387ef358e61b7a23da833e01376074) @@ -302,5 +302,5 @@ 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; Index: uspace/lib/c/generic/io/log.c =================================================================== --- uspace/lib/c/generic/io/log.c (revision 920d0fc6fcf84fd2fdbf02cb9004b0d38e32027e) +++ uspace/lib/c/generic/io/log.c (revision a1a101df39387ef358e61b7a23da833e01376074) @@ -192,10 +192,10 @@ * @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); } @@ -208,5 +208,5 @@ * @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); Index: uspace/lib/c/include/io/log.h =================================================================== --- uspace/lib/c/include/io/log.h (revision 920d0fc6fcf84fd2fdbf02cb9004b0d38e32027e) +++ uspace/lib/c/include/io/log.h (revision a1a101df39387ef358e61b7a23da833e01376074) @@ -62,11 +62,6 @@ 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 Index: uspace/lib/drv/generic/log.c =================================================================== --- uspace/lib/drv/generic/log.c (revision 920d0fc6fcf84fd2fdbf02cb9004b0d38e32027e) +++ uspace/lib/drv/generic/log.c (revision a1a101df39387ef358e61b7a23da833e01376074) @@ -58,5 +58,5 @@ va_start(args, fmt); - log_msgv(level, fmt, args); + log_msgv(LOG_DEFAULT, level, fmt, args); va_end(args); } Index: uspace/lib/usb/include/usb/debug.h =================================================================== --- uspace/lib/usb/include/usb/debug.h (revision 920d0fc6fcf84fd2fdbf02cb9004b0d38e32027e) +++ uspace/lib/usb/include/usb/debug.h (revision a1a101df39387ef358e61b7a23da833e01376074) @@ -59,5 +59,5 @@ #define usb_log_printf(level, format, ...) \ - log_msg(level, format, ##__VA_ARGS__) + log_msg(LOG_DEFAULT, level, format, ##__VA_ARGS__) /** Log fatal error. */ Index: uspace/srv/devman/devman.c =================================================================== --- uspace/srv/devman/devman.c (revision 920d0fc6fcf84fd2fdbf02cb9004b0d38e32027e) +++ uspace/srv/devman/devman.c (revision a1a101df39387ef358e61b7a23da833e01376074) @@ -151,5 +151,5 @@ 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); } @@ -242,5 +242,5 @@ 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; @@ -252,5 +252,5 @@ 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; @@ -261,5 +261,5 @@ 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; @@ -268,5 +268,5 @@ 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; @@ -275,5 +275,5 @@ 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; @@ -314,5 +314,5 @@ 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); @@ -346,5 +346,5 @@ 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; @@ -374,5 +374,5 @@ 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; @@ -408,5 +408,5 @@ 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); @@ -495,5 +495,5 @@ 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); @@ -520,5 +520,5 @@ 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); @@ -545,9 +545,9 @@ 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; @@ -594,5 +594,5 @@ 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); @@ -614,5 +614,5 @@ } - 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); @@ -650,5 +650,5 @@ * 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; @@ -667,5 +667,5 @@ 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); @@ -761,5 +761,5 @@ * 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); @@ -827,5 +827,5 @@ 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; @@ -867,5 +867,5 @@ 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); @@ -890,5 +890,5 @@ 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); @@ -911,5 +911,5 @@ 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); @@ -939,5 +939,5 @@ 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); @@ -970,5 +970,5 @@ 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; @@ -1261,5 +1261,5 @@ 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; } @@ -1289,5 +1289,5 @@ 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); @@ -1313,5 +1313,5 @@ 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. */ Index: uspace/srv/devman/main.c =================================================================== --- uspace/srv/devman/main.c (revision 920d0fc6fcf84fd2fdbf02cb9004b0d38e32027e) +++ uspace/srv/devman/main.c (revision a1a101df39387ef358e61b7a23da833e01376074) @@ -73,5 +73,5 @@ char *drv_name = NULL; - log_msg(LVL_DEBUG, "devman_driver_register"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "devman_driver_register"); /* Get driver name. */ @@ -82,5 +82,5 @@ } - 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); @@ -88,5 +88,5 @@ 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; @@ -102,5 +102,5 @@ 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); @@ -112,5 +112,5 @@ 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; @@ -125,5 +125,5 @@ /* 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); @@ -136,5 +136,5 @@ 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); @@ -147,5 +147,5 @@ 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); @@ -176,5 +176,5 @@ 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); @@ -184,5 +184,5 @@ 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; @@ -198,5 +198,5 @@ 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; @@ -205,5 +205,5 @@ 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; @@ -248,5 +248,5 @@ 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; @@ -264,5 +264,5 @@ } - 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) { @@ -282,5 +282,5 @@ 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 */ @@ -305,5 +305,5 @@ 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; @@ -311,5 +311,5 @@ 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); @@ -359,5 +359,5 @@ 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; } @@ -391,5 +391,5 @@ 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); @@ -507,8 +507,8 @@ 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); } @@ -529,5 +529,5 @@ 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)); @@ -620,5 +620,5 @@ 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 */ @@ -653,5 +653,5 @@ /* 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."); @@ -692,5 +692,5 @@ 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); @@ -712,5 +712,5 @@ 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); } @@ -726,5 +726,5 @@ 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; @@ -742,5 +742,5 @@ 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; } @@ -1229,5 +1229,5 @@ */ 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); @@ -1236,5 +1236,5 @@ 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); @@ -1264,5 +1264,5 @@ 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); @@ -1277,5 +1277,5 @@ 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); @@ -1284,9 +1284,9 @@ 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); @@ -1320,5 +1320,5 @@ 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); @@ -1338,5 +1338,5 @@ 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); @@ -1394,5 +1394,5 @@ 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. */ @@ -1400,13 +1400,13 @@ 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; } @@ -1440,5 +1440,5 @@ if (!devman_init()) { - log_msg(LVL_ERROR, "Error while initializing service."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Error while initializing service."); return -1; } @@ -1447,5 +1447,5 @@ 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; } Index: uspace/srv/net/ethip/arp.c =================================================================== --- uspace/srv/net/ethip/arp.c (revision 920d0fc6fcf84fd2fdbf02cb9004b0d38e32027e) +++ uspace/srv/net/ethip/arp.c (revision a1a101df39387ef358e61b7a23da833e01376074) @@ -59,5 +59,5 @@ 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); @@ -65,10 +65,10 @@ 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, @@ -122,5 +122,5 @@ 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); Index: uspace/srv/net/ethip/ethip.c =================================================================== --- uspace/srv/net/ethip/ethip.c (revision 920d0fc6fcf84fd2fdbf02cb9004b0d38e32027e) +++ uspace/srv/net/ethip/ethip.c (revision a1a101df39387ef358e61b7a23da833e01376074) @@ -77,5 +77,5 @@ 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; } @@ -96,5 +96,5 @@ 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); @@ -104,5 +104,5 @@ 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; } @@ -110,5 +110,5 @@ 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; } @@ -118,5 +118,5 @@ 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; } @@ -124,5 +124,5 @@ 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; } @@ -142,8 +142,8 @@ 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; } @@ -154,5 +154,5 @@ static int ethip_open(iplink_srv_t *srv) { - log_msg(LVL_DEBUG, "ethip_open()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_open()"); return EOK; } @@ -160,5 +160,5 @@ static int ethip_close(iplink_srv_t *srv) { - log_msg(LVL_DEBUG, "ethip_close()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_close()"); return EOK; } @@ -173,9 +173,9 @@ 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; @@ -200,5 +200,5 @@ 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; @@ -206,10 +206,10 @@ int rc; - log_msg(LVL_DEBUG, "ethip_received()"); - - log_msg(LVL_DEBUG, " - eth_pdu_decode"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_received()"); + + 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; } @@ -220,14 +220,14 @@ 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); } @@ -239,5 +239,5 @@ 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; @@ -248,5 +248,5 @@ 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); } @@ -256,5 +256,5 @@ 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); } Index: uspace/srv/net/ethip/ethip_nic.c =================================================================== --- uspace/srv/net/ethip/ethip_nic.c (revision 920d0fc6fcf84fd2fdbf02cb9004b0d38e32027e) +++ uspace/srv/net/ethip/ethip_nic.c (revision a1a101df39387ef358e61b7a23da833e01376074) @@ -68,5 +68,5 @@ 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; @@ -75,5 +75,5 @@ 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; @@ -93,9 +93,9 @@ 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."); } } @@ -110,5 +110,5 @@ 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; @@ -126,5 +126,5 @@ 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; @@ -153,5 +153,5 @@ 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) @@ -160,5 +160,5 @@ 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; } @@ -166,5 +166,5 @@ 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; } @@ -174,10 +174,10 @@ 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; @@ -189,5 +189,5 @@ 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; @@ -198,10 +198,10 @@ 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); @@ -225,5 +225,5 @@ 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); } @@ -236,21 +236,21 @@ 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); } @@ -259,5 +259,5 @@ 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); } @@ -267,5 +267,5 @@ 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) { @@ -298,5 +298,5 @@ 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; @@ -308,19 +308,19 @@ 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; } @@ -329,7 +329,7 @@ { 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; } @@ -339,5 +339,5 @@ 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) @@ -352,5 +352,5 @@ 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); @@ -366,5 +366,5 @@ 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) { Index: uspace/srv/net/ethip/pdu.c =================================================================== --- uspace/srv/net/ethip/pdu.c (revision 920d0fc6fcf84fd2fdbf02cb9004b0d38e32027e) +++ uspace/srv/net/ethip/pdu.c (revision a1a101df39387ef358e61b7a23da833e01376074) @@ -69,7 +69,7 @@ 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; @@ -83,8 +83,8 @@ 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; } @@ -104,7 +104,7 @@ 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; @@ -143,5 +143,5 @@ 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); @@ -183,8 +183,8 @@ 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; } @@ -193,5 +193,5 @@ 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; @@ -199,5 +199,5 @@ 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; @@ -205,5 +205,5 @@ 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; @@ -211,5 +211,5 @@ 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; @@ -220,5 +220,5 @@ 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; @@ -231,5 +231,5 @@ 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; Index: uspace/srv/net/inetsrv/addrobj.c =================================================================== --- uspace/srv/net/inetsrv/addrobj.c (revision 920d0fc6fcf84fd2fdbf02cb9004b0d38e32027e) +++ uspace/srv/net/inetsrv/addrobj.c (revision a1a101df39387ef358e61b7a23da833e01376074) @@ -59,5 +59,5 @@ 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; @@ -114,5 +114,5 @@ 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); @@ -125,5 +125,5 @@ 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; @@ -131,5 +131,5 @@ } - 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); @@ -147,5 +147,5 @@ 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); @@ -155,5 +155,5 @@ 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; @@ -161,5 +161,5 @@ } - 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; @@ -177,5 +177,5 @@ 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); @@ -194,5 +194,5 @@ 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); Index: uspace/srv/net/inetsrv/icmp.c =================================================================== --- uspace/srv/net/inetsrv/icmp.c (revision 920d0fc6fcf84fd2fdbf02cb9004b0d38e32027e) +++ uspace/srv/net/inetsrv/icmp.c (revision a1a101df39387ef358e61b7a23da833e01376074) @@ -57,5 +57,5 @@ uint8_t type; - log_msg(LVL_DEBUG, "icmp_recv()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "icmp_recv()"); if (dgram->size < 1) @@ -84,5 +84,5 @@ 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)) @@ -124,5 +124,5 @@ 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)) Index: uspace/srv/net/inetsrv/inet_link.c =================================================================== --- uspace/srv/net/inetsrv/inet_link.c (revision 920d0fc6fcf84fd2fdbf02cb9004b0d38e32027e) +++ uspace/srv/net/inetsrv/inet_link.c (revision a1a101df39387ef358e61b7a23da833e01376074) @@ -64,14 +64,14 @@ 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); @@ -91,5 +91,5 @@ 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; @@ -98,5 +98,5 @@ 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; @@ -116,9 +116,9 @@ 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."); } } @@ -133,5 +133,5 @@ 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; @@ -156,5 +156,5 @@ 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) @@ -166,5 +166,5 @@ 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; } @@ -172,5 +172,5 @@ 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; } @@ -178,5 +178,5 @@ 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; @@ -185,10 +185,10 @@ 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); @@ -209,5 +209,5 @@ 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 */ @@ -218,5 +218,5 @@ 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); @@ -245,5 +245,5 @@ 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; Index: uspace/srv/net/inetsrv/inetcfg.c =================================================================== --- uspace/srv/net/inetsrv/inetcfg.c (revision 920d0fc6fcf84fd2fdbf02cb9004b0d38e32027e) +++ uspace/srv/net/inetsrv/inetcfg.c (revision a1a101df39387ef358e61b7a23da833e01376074) @@ -61,5 +61,5 @@ 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; @@ -77,5 +77,5 @@ 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; @@ -85,5 +85,5 @@ 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); @@ -130,5 +130,5 @@ 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; } @@ -136,5 +136,5 @@ 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; } @@ -228,5 +228,5 @@ 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; } @@ -245,5 +245,5 @@ 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, @@ -269,5 +269,5 @@ 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); @@ -287,5 +287,5 @@ 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; @@ -321,5 +321,5 @@ 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); @@ -348,5 +348,5 @@ 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)) { @@ -382,5 +382,5 @@ 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)) { @@ -415,5 +415,5 @@ 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)) { @@ -449,5 +449,5 @@ 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; @@ -482,5 +482,5 @@ 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, @@ -506,5 +506,5 @@ 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); @@ -524,5 +524,5 @@ 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; @@ -557,5 +557,5 @@ 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, @@ -574,5 +574,5 @@ 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 */ Index: uspace/srv/net/inetsrv/inetping.c =================================================================== --- uspace/srv/net/inetsrv/inetping.c (revision 920d0fc6fcf84fd2fdbf02cb9004b0d38e32027e) +++ uspace/srv/net/inetsrv/inetping.c (revision a1a101df39387ef358e61b7a23da833e01376074) @@ -76,5 +76,5 @@ 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; } @@ -107,5 +107,5 @@ 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, @@ -133,5 +133,5 @@ 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); @@ -192,5 +192,5 @@ int rc; - log_msg(LVL_DEBUG, "inetping_conn()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "inetping_conn()"); /* Accept the connection */ Index: uspace/srv/net/inetsrv/inetsrv.c =================================================================== --- uspace/srv/net/inetsrv/inetsrv.c (revision 920d0fc6fcf84fd2fdbf02cb9004b0d38e32027e) +++ uspace/srv/net/inetsrv/inetsrv.c (revision a1a101df39387ef358e61b7a23da833e01376074) @@ -66,5 +66,5 @@ 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); @@ -72,5 +72,5 @@ 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; } @@ -80,5 +80,5 @@ 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; } @@ -87,5 +87,5 @@ 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; } @@ -94,5 +94,5 @@ 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; } @@ -108,5 +108,5 @@ 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); @@ -143,5 +143,5 @@ 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; } @@ -194,5 +194,5 @@ 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); @@ -212,5 +212,5 @@ 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); @@ -238,5 +238,5 @@ 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) { @@ -272,5 +272,5 @@ inet_client_t client; - log_msg(LVL_DEBUG, "inet_default_conn()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_default_conn()"); /* Accept the connection */ @@ -378,5 +378,5 @@ 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 */ @@ -386,5 +386,5 @@ 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; Index: uspace/srv/net/inetsrv/pdu.c =================================================================== --- uspace/srv/net/inetsrv/pdu.c (revision 920d0fc6fcf84fd2fdbf02cb9004b0d38e32027e) +++ uspace/srv/net/inetsrv/pdu.c (revision a1a101df39387ef358e61b7a23da833e01376074) @@ -204,8 +204,8 @@ 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; } @@ -216,5 +216,5 @@ 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; } @@ -222,10 +222,10 @@ 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; @@ -256,5 +256,5 @@ 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; } Index: uspace/srv/net/inetsrv/reass.c =================================================================== --- uspace/srv/net/inetsrv/reass.c (revision 920d0fc6fcf84fd2fdbf02cb9004b0d38e32027e) +++ uspace/srv/net/inetsrv/reass.c (revision a1a101df39387ef358e61b7a23da833e01376074) @@ -86,5 +86,5 @@ 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); @@ -95,5 +95,5 @@ /* 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; } Index: uspace/srv/net/inetsrv/sroute.c =================================================================== --- uspace/srv/net/inetsrv/sroute.c (revision 920d0fc6fcf84fd2fdbf02cb9004b0d38e32027e) +++ uspace/srv/net/inetsrv/sroute.c (revision a1a101df39387ef358e61b7a23da833e01376074) @@ -57,5 +57,5 @@ 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; @@ -100,5 +100,5 @@ 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); @@ -117,5 +117,5 @@ 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; @@ -123,5 +123,5 @@ } - 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); @@ -136,5 +136,5 @@ 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); @@ -147,5 +147,5 @@ 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; @@ -153,5 +153,5 @@ } - 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); @@ -166,5 +166,5 @@ 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); Index: uspace/srv/net/loopip/loopip.c =================================================================== --- uspace/srv/net/loopip/loopip.c (revision 920d0fc6fcf84fd2fdbf02cb9004b0d38e32027e) +++ uspace/srv/net/loopip/loopip.c (revision a1a101df39387ef358e61b7a23da833e01376074) @@ -75,5 +75,5 @@ { 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); @@ -96,5 +96,5 @@ 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; } @@ -108,5 +108,5 @@ 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; } @@ -114,5 +114,5 @@ 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; } @@ -120,5 +120,5 @@ 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; } @@ -135,5 +135,5 @@ 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); } @@ -141,5 +141,5 @@ static int loopip_open(iplink_srv_t *srv) { - log_msg(LVL_DEBUG, "loopip_open()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "loopip_open()"); return EOK; } @@ -147,5 +147,5 @@ static int loopip_close(iplink_srv_t *srv) { - log_msg(LVL_DEBUG, "loopip_close()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "loopip_close()"); return EOK; } @@ -155,5 +155,5 @@ 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)); @@ -184,5 +184,5 @@ 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; @@ -191,5 +191,5 @@ 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; } @@ -197,5 +197,5 @@ 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; } Index: uspace/srv/net/tcp/conn.c =================================================================== --- uspace/srv/net/tcp/conn.c (revision 920d0fc6fcf84fd2fdbf02cb9004b0d38e32027e) +++ uspace/srv/net/tcp/conn.c (revision a1a101df39387ef358e61b7a23da833e01376074) @@ -164,5 +164,5 @@ 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); @@ -184,5 +184,5 @@ 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); } @@ -196,5 +196,5 @@ 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) @@ -211,5 +211,5 @@ 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); @@ -245,5 +245,5 @@ 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; @@ -253,8 +253,8 @@ /* 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"); } @@ -293,13 +293,13 @@ 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); @@ -312,5 +312,5 @@ 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); @@ -323,5 +323,5 @@ return false; - log_msg(LVL_DEBUG2, " -> match"); + log_msg(LOG_DEFAULT, LVL_DEBUG2, " -> match"); return true; @@ -331,5 +331,5 @@ 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)) @@ -353,5 +353,5 @@ 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); @@ -360,5 +360,5 @@ 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); @@ -380,5 +380,5 @@ 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; @@ -398,5 +398,5 @@ { /* TODO */ - log_msg(LVL_DEBUG, "%s: tcp_reset_signal()", conn->name); + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_reset_signal()", conn->name); } @@ -422,5 +422,5 @@ 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); } @@ -436,13 +436,13 @@ 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; @@ -450,9 +450,9 @@ if ((seg->ctrl & CTL_SYN) == 0) { - log_msg(LVL_DEBUG, "SYN not present. Ignoring segment."); - return; - } - - log_msg(LVL_DEBUG, "Got SYN, sending SYN, ACK."); + log_msg(LOG_DEFAULT, LVL_DEBUG, "SYN not present. Ignoring segment."); + return; + } + + log_msg(LOG_DEFAULT, LVL_DEBUG, "Got SYN, sending SYN, ACK."); conn->rcv_nxt = seg->seq + 1; @@ -460,8 +460,8 @@ - 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 */ @@ -493,15 +493,15 @@ 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; @@ -512,5 +512,5 @@ /* 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 */ @@ -518,5 +518,5 @@ 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; @@ -527,5 +527,5 @@ 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; } @@ -544,5 +544,5 @@ } - log_msg(LVL_DEBUG, "Sent SYN, got SYN."); + log_msg(LOG_DEFAULT, LVL_DEBUG, "Sent SYN, got SYN."); /* @@ -551,5 +551,5 @@ * 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; @@ -558,9 +558,9 @@ 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); @@ -582,9 +582,9 @@ 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); @@ -682,5 +682,5 @@ 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"); /* @@ -705,5 +705,5 @@ 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); @@ -711,5 +711,5 @@ } - 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); @@ -730,14 +730,14 @@ 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(LVL_DEBUG, "SEG.ACK=%u, SND.UNA=%u, SND.NXT=%u", + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_seg_proc_ack_est(%p, %p)", conn, seg); + + 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. */ @@ -746,5 +746,5 @@ return cp_done; } else { - log_msg(LVL_DEBUG, "Ignoring duplicate ACK."); + log_msg(LOG_DEFAULT, LVL_DEBUG, "Ignoring duplicate ACK."); } } else { @@ -758,5 +758,5 @@ 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); @@ -785,5 +785,5 @@ 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); } @@ -850,5 +850,5 @@ 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); @@ -881,9 +881,9 @@ 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; @@ -940,5 +940,5 @@ 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); @@ -982,5 +982,5 @@ 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 */ @@ -998,5 +998,5 @@ 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); @@ -1018,12 +1018,12 @@ 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 */ @@ -1042,15 +1042,15 @@ 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); @@ -1091,5 +1091,5 @@ 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); @@ -1097,5 +1097,5 @@ /* 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); @@ -1131,5 +1131,5 @@ */ 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); @@ -1146,5 +1146,5 @@ 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); @@ -1165,5 +1165,5 @@ 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); } @@ -1178,10 +1178,10 @@ 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); @@ -1189,5 +1189,5 @@ } - 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); @@ -1240,5 +1240,5 @@ 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) @@ -1268,5 +1268,5 @@ 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); Index: uspace/srv/net/tcp/iqueue.c =================================================================== --- uspace/srv/net/tcp/iqueue.c (revision 920d0fc6fcf84fd2fdbf02cb9004b0d38e32027e) +++ uspace/srv/net/tcp/iqueue.c (revision a1a101df39387ef358e61b7a23da833e01376074) @@ -67,9 +67,9 @@ 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; } @@ -108,9 +108,9 @@ 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; } @@ -119,5 +119,5 @@ 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, @@ -130,5 +130,5 @@ 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; } @@ -139,5 +139,5 @@ /* 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); @@ -145,5 +145,5 @@ } - 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; Index: uspace/srv/net/tcp/ncsim.c =================================================================== --- uspace/srv/net/tcp/ncsim.c (revision 920d0fc6fcf84fd2fdbf02cb9004b0d38e32027e) +++ uspace/srv/net/tcp/ncsim.c (revision a1a101df39387ef358e61b7a23da833e01376074) @@ -74,5 +74,5 @@ 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; @@ -80,5 +80,5 @@ 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; @@ -87,5 +87,5 @@ 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; } @@ -126,5 +126,5 @@ int rc; - log_msg(LVL_DEBUG, "tcp_ncsim_fibril()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_ncsim_fibril()"); @@ -139,5 +139,5 @@ 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); @@ -147,5 +147,5 @@ 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); @@ -161,9 +161,9 @@ 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; } Index: uspace/srv/net/tcp/rqueue.c =================================================================== --- uspace/srv/net/tcp/rqueue.c (revision 920d0fc6fcf84fd2fdbf02cb9004b0d38e32027e) +++ uspace/srv/net/tcp/rqueue.c (revision a1a101df39387ef358e61b7a23da833e01376074) @@ -74,5 +74,5 @@ 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 @@ -81,10 +81,10 @@ 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; } @@ -112,5 +112,5 @@ { 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); @@ -118,5 +118,5 @@ 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; } @@ -134,5 +134,5 @@ tcp_rqueue_entry_t *rqe; - log_msg(LVL_DEBUG, "tcp_rqueue_fibril()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_rqueue_fibril()"); while (true) { @@ -152,9 +152,9 @@ 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; } Index: uspace/srv/net/tcp/segment.c =================================================================== --- uspace/srv/net/tcp/segment.c (revision 920d0fc6fcf84fd2fdbf02cb9004b0d38e32027e) +++ uspace/srv/net/tcp/segment.c (revision a1a101df39387ef358e61b7a23da833e01376074) @@ -248,11 +248,11 @@ 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); } Index: uspace/srv/net/tcp/sock.c =================================================================== --- uspace/srv/net/tcp/sock.c (revision 920d0fc6fcf84fd2fdbf02cb9004b0d38e32027e) +++ uspace/srv/net/tcp/sock.c (revision a1a101df39387ef358e61b7a23da833e01376074) @@ -91,5 +91,5 @@ 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, @@ -100,5 +100,5 @@ 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, @@ -111,5 +111,5 @@ tcp_sockdata_t *sock; - log_msg(LVL_DEBUG, "tcp_sock_create()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_create()"); *rsock = NULL; @@ -133,5 +133,5 @@ 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); } @@ -142,5 +142,5 @@ 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); @@ -171,5 +171,5 @@ 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); @@ -208,6 +208,6 @@ 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) { @@ -216,5 +216,5 @@ } - 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, @@ -225,5 +225,5 @@ } - 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) { @@ -233,5 +233,5 @@ } - log_msg(LVL_DEBUG, " - success"); + log_msg(LOG_DEFAULT, LVL_DEBUG, " - success"); async_answer_0(callid, EOK); } @@ -250,5 +250,5 @@ 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); @@ -284,5 +284,5 @@ } - log_msg(LVL_DEBUG, " - open connections"); + log_msg(LOG_DEFAULT, LVL_DEBUG, " - open connections"); lsocket.addr.ipv4 = TCP_IPV4_ANY; @@ -337,5 +337,5 @@ 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); @@ -377,5 +377,5 @@ 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; @@ -383,5 +383,5 @@ 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); } @@ -431,5 +431,5 @@ 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); @@ -445,5 +445,5 @@ 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); @@ -498,5 +498,5 @@ 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); @@ -510,5 +510,5 @@ 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); @@ -521,5 +521,5 @@ /* 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); } @@ -539,5 +539,5 @@ 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); @@ -611,5 +611,5 @@ 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); } @@ -629,5 +629,5 @@ 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); @@ -651,13 +651,13 @@ (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; @@ -679,5 +679,5 @@ } - 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); @@ -694,5 +694,5 @@ 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); @@ -705,5 +705,5 @@ 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) { @@ -715,5 +715,5 @@ } - 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); @@ -726,9 +726,9 @@ 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) { @@ -758,5 +758,5 @@ 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); @@ -798,5 +798,5 @@ 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); } @@ -804,5 +804,5 @@ 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); } @@ -815,5 +815,5 @@ 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); @@ -828,5 +828,5 @@ 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 */ @@ -842,10 +842,10 @@ 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, @@ -863,5 +863,5 @@ } - 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; @@ -895,5 +895,5 @@ 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)); @@ -940,5 +940,5 @@ /* 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); Index: uspace/srv/net/tcp/tcp.c =================================================================== --- uspace/srv/net/tcp/tcp.c (revision 920d0fc6fcf84fd2fdbf02cb9004b0d38e32027e) +++ uspace/srv/net/tcp/tcp.c (revision a1a101df39387ef358e61b7a23da833e01376074) @@ -69,5 +69,5 @@ 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; @@ -76,5 +76,5 @@ /* 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; @@ -84,5 +84,5 @@ 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; @@ -96,5 +96,5 @@ 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; @@ -102,14 +102,14 @@ 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; } @@ -117,5 +117,5 @@ 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); @@ -137,5 +137,5 @@ 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; } @@ -153,5 +153,5 @@ 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."); } @@ -162,8 +162,8 @@ 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; } @@ -177,5 +177,5 @@ int rc; - log_msg(LVL_DEBUG, "tcp_init()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_init()"); tcp_rqueue_init(); @@ -189,5 +189,5 @@ 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; } @@ -195,5 +195,5 @@ 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; } Index: uspace/srv/net/tcp/tqueue.c =================================================================== --- uspace/srv/net/tcp/tqueue.c (revision 920d0fc6fcf84fd2fdbf02cb9004b0d38e32027e) +++ uspace/srv/net/tcp/tqueue.c (revision a1a101df39387ef358e61b7a23da833e01376074) @@ -88,5 +88,5 @@ 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); @@ -99,5 +99,5 @@ 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); @@ -109,5 +109,5 @@ 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; @@ -116,5 +116,5 @@ 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; @@ -165,5 +165,5 @@ 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 */ @@ -172,5 +172,5 @@ 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); @@ -185,5 +185,5 @@ 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; @@ -194,5 +194,5 @@ 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; } @@ -223,5 +223,5 @@ 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); @@ -239,6 +239,6 @@ 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); @@ -267,5 +267,5 @@ 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); @@ -282,9 +282,9 @@ 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); @@ -300,5 +300,5 @@ 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; } @@ -315,10 +315,10 @@ 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); @@ -328,5 +328,5 @@ 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); @@ -338,5 +338,5 @@ 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); @@ -345,5 +345,5 @@ } - 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); @@ -358,5 +358,5 @@ 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 */ @@ -371,5 +371,5 @@ 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) Index: uspace/srv/net/tcp/ucall.c =================================================================== --- uspace/srv/net/tcp/ucall.c (revision 920d0fc6fcf84fd2fdbf02cb9004b0d38e32027e) +++ uspace/srv/net/tcp/ucall.c (revision a1a101df39387ef358e61b7a23da833e01376074) @@ -70,5 +70,5 @@ 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); @@ -88,5 +88,5 @@ /* 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 || @@ -97,5 +97,5 @@ 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); @@ -104,8 +104,8 @@ 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; } @@ -118,5 +118,5 @@ 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); @@ -141,5 +141,5 @@ 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); @@ -175,5 +175,5 @@ 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); @@ -186,5 +186,5 @@ /* 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); } @@ -223,5 +223,5 @@ 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); @@ -234,5 +234,5 @@ 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); @@ -258,5 +258,5 @@ void tcp_uc_abort(tcp_conn_t *conn) { - log_msg(LVL_DEBUG, "tcp_uc_abort()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_uc_abort()"); } @@ -264,5 +264,5 @@ 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; } @@ -276,5 +276,5 @@ 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); } @@ -282,5 +282,5 @@ 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); @@ -298,5 +298,5 @@ 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); @@ -304,5 +304,5 @@ 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; @@ -312,5 +312,5 @@ 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); @@ -339,5 +339,5 @@ void tcp_to_user(void) { - log_msg(LVL_DEBUG, "tcp_to_user()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_to_user()"); } Index: uspace/srv/net/udp/assoc.c =================================================================== --- uspace/srv/net/udp/assoc.c (revision 920d0fc6fcf84fd2fdbf02cb9004b0d38e32027e) +++ uspace/srv/net/udp/assoc.c (revision a1a101df39387ef358e61b7a23da833e01376074) @@ -104,5 +104,5 @@ 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)) { @@ -127,5 +127,5 @@ 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); } @@ -139,5 +139,5 @@ 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) @@ -154,5 +154,5 @@ 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); @@ -192,5 +192,5 @@ 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; @@ -205,5 +205,5 @@ 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; @@ -228,5 +228,5 @@ 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); @@ -261,13 +261,13 @@ 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); @@ -291,9 +291,9 @@ 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. */ @@ -303,5 +303,5 @@ 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? */ } @@ -313,5 +313,5 @@ 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); @@ -336,5 +336,5 @@ 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); @@ -347,5 +347,5 @@ return false; - log_msg(LVL_DEBUG, " -> match"); + log_msg(LOG_DEFAULT, LVL_DEBUG, " -> match"); return true; @@ -355,5 +355,5 @@ 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)) @@ -363,5 +363,5 @@ return false; - log_msg(LVL_DEBUG, "Socket pair matched."); + log_msg(LOG_DEFAULT, LVL_DEBUG, "Socket pair matched."); return true; } @@ -379,5 +379,5 @@ 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); @@ -386,5 +386,5 @@ 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); @@ -395,5 +395,5 @@ 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); Index: uspace/srv/net/udp/sock.c =================================================================== --- uspace/srv/net/udp/sock.c (revision 920d0fc6fcf84fd2fdbf02cb9004b0d38e32027e) +++ uspace/srv/net/udp/sock.c (revision a1a101df39387ef358e61b7a23da833e01376074) @@ -88,5 +88,5 @@ 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, @@ -103,5 +103,5 @@ 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) { @@ -167,6 +167,6 @@ 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; @@ -178,5 +178,5 @@ } - 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, @@ -192,5 +192,5 @@ } - 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) { @@ -222,5 +222,5 @@ } - log_msg(LVL_DEBUG, " - success"); + log_msg(LOG_DEFAULT, LVL_DEBUG, " - success"); async_answer_0(callid, rc); out: @@ -231,5 +231,5 @@ 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); } @@ -237,5 +237,5 @@ 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); } @@ -243,5 +243,5 @@ 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); } @@ -264,5 +264,5 @@ int rc; - log_msg(LVL_DEBUG, "udp_sock_send()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_sock_send()"); addr = NULL; @@ -323,5 +323,5 @@ 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; @@ -329,5 +329,5 @@ 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); } @@ -405,5 +405,5 @@ 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); @@ -427,13 +427,13 @@ (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; @@ -441,5 +441,5 @@ 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) { @@ -458,5 +458,5 @@ } - 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); @@ -472,5 +472,5 @@ 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); @@ -483,5 +483,5 @@ 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) { @@ -493,5 +493,5 @@ } - 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); @@ -504,5 +504,5 @@ 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); @@ -510,5 +510,5 @@ 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); @@ -531,5 +531,5 @@ 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); @@ -557,5 +557,5 @@ 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); } @@ -563,5 +563,5 @@ 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); } @@ -574,8 +574,8 @@ 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) { @@ -584,5 +584,5 @@ } - 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); @@ -597,5 +597,5 @@ } - 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; @@ -622,10 +622,10 @@ 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)); @@ -670,5 +670,5 @@ /* 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); Index: uspace/srv/net/udp/ucall.c =================================================================== --- uspace/srv/net/udp/ucall.c (revision 920d0fc6fcf84fd2fdbf02cb9004b0d38e32027e) +++ uspace/srv/net/udp/ucall.c (revision a1a101df39387ef358e61b7a23da833e01376074) @@ -47,5 +47,5 @@ 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) @@ -59,5 +59,5 @@ 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); @@ -67,5 +67,5 @@ 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); @@ -79,5 +79,5 @@ 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; @@ -103,5 +103,5 @@ 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) { @@ -118,5 +118,5 @@ 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; } @@ -124,5 +124,5 @@ 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); Index: uspace/srv/net/udp/udp.c =================================================================== --- uspace/srv/net/udp/udp.c (revision 920d0fc6fcf84fd2fdbf02cb9004b0d38e32027e) +++ uspace/srv/net/udp/udp.c (revision a1a101df39387ef358e61b7a23da833e01376074) @@ -50,9 +50,9 @@ 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; } @@ -60,5 +60,5 @@ 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; } Index: uspace/srv/net/udp/udp_inet.c =================================================================== --- uspace/srv/net/udp/udp_inet.c (revision 920d0fc6fcf84fd2fdbf02cb9004b0d38e32027e) +++ uspace/srv/net/udp/udp_inet.c (revision a1a101df39387ef358e61b7a23da833e01376074) @@ -61,5 +61,5 @@ 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(); @@ -69,5 +69,5 @@ 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); @@ -84,5 +84,5 @@ 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; @@ -94,5 +94,5 @@ 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; @@ -105,8 +105,8 @@ 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; } @@ -124,9 +124,9 @@ 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; }