diff --git a/include/utils.h b/include/utils.h index 9b46d89bf..85c7b1611 100644 --- a/include/utils.h +++ b/include/utils.h @@ -41,7 +41,7 @@ void print(enum log_level lvl, const char *fmt, ...); * - 0 on success * - otherwise an error occured */ -int resolve(const char *addr, struct sockaddr_in *sa, int flags); +int resolve_addr(const char *addr, struct sockaddr_in *sa, int flags); /** Setup various realtime related things. * @@ -53,7 +53,7 @@ int resolve(const char *addr, struct sockaddr_in *sa, int flags); * * @param g The global configuration */ -void realtime_init(struct config *g); +void init_realtime(struct config *g); /// Check assertion and exit if failed. #define assert(exp) do { \ diff --git a/src/cfg.c b/src/cfg.c index d0cfb5c0e..2839bf394 100644 --- a/src/cfg.c +++ b/src/cfg.c @@ -159,10 +159,10 @@ int config_parse_node(config_setting_t *c, struct config *g) info("Loading %s node '%s'", type_str, name); - if (resolve(local_str, &local, 0)) + if (resolve_addr(local_str, &local, 0)) cerror(c, "Failed to resolve local address '%s' of node '%s'", local_str, name); - if (resolve(remote_str, &remote, 0)) + if (resolve_addr(remote_str, &remote, 0)) cerror(c, "Failed to resolve remote address '%s' of node '%s'", remote_str, name); if (node_create(&g->nodes[g->node_count], name, type, local, remote)) @@ -170,4 +170,3 @@ int config_parse_node(config_setting_t *c, struct config *g) g->node_count++; } - diff --git a/src/receive.c b/src/receive.c index fd2f953bf..779d92871 100644 --- a/src/receive.c +++ b/src/receive.c @@ -56,7 +56,7 @@ int main(int argc, char *argv[]) struct sockaddr_in local; struct sockaddr_in remote; - if (resolve(local_str, &local, 0)) + if (resolve_addr(local_str, &local, 0)) error("Failed to resolve remote address: %s", local_str); /* Print header */ diff --git a/src/send.c b/src/send.c index 24a62e797..277a234a6 100644 --- a/src/send.c +++ b/src/send.c @@ -60,7 +60,7 @@ int main(int argc, char *argv[]) struct sockaddr_in local; struct sockaddr_in remote; - if (argc == 4 && resolve(remote_str, &remote, 0)) + if (argc == 4 && resolve_addr(remote_str, &remote, 0)) error("Failed to resolve local address: %s", local_str); else { local.sin_family = AF_INET; @@ -68,7 +68,7 @@ int main(int argc, char *argv[]) local.sin_port = 0; } - if (resolve(remote_str, &remote, 0)) + if (resolve_addr(remote_str, &remote, 0)) error("Failed to resolve remote address: %s", remote_str); /* Create node */ diff --git a/src/server.c b/src/server.c index dcbaa3184..603c6d9e9 100644 --- a/src/server.c +++ b/src/server.c @@ -100,14 +100,14 @@ int main(int argc, char *argv[]) config_init(&config.obj); config_parse(&config.obj, &config); - /* Setup various realtime related things */ - realtime_init(&config); if (config.path_count) info("Parsed %u nodes and %u paths", config.node_count, config.path_count); else error("No paths found. Terminating..."); + /* Setup various realtime related things */ + init_realtime(&config); /* Start and connect all paths/nodes */ start(); diff --git a/src/test.c b/src/test.c index 1f6bc6e93..1e5af4ee1 100644 --- a/src/test.c +++ b/src/test.c @@ -54,7 +54,7 @@ int main(int argc, char *argv[]) struct sockaddr_in remote; struct sockaddr_in local; - if (argc == 4 && resolve(remote_str, &remote, 0)) + if (resolve_addr(local_str, &local, 0)) error("Failed to resolve local address: %s", local_str); else { local.sin_family = AF_INET; @@ -62,7 +62,7 @@ int main(int argc, char *argv[]) local.sin_port = 0; } - if (resolve(remote_str, &remote, 0)) + if (resolve_addr(remote_str, &remote, 0)) error("Failed to resolve remote address: %s", remote_str); /* Create node */ diff --git a/src/utils.c b/src/utils.c index e58a22507..46426b761 100644 --- a/src/utils.c +++ b/src/utils.c @@ -48,7 +48,7 @@ void print(enum log_level lvl, const char *fmt, ...) va_end(ap); } -int resolve(const char *addr, struct sockaddr_in *sa, int flags) +int resolve_addr(const char *addr, struct sockaddr_in *sa, int flags) { int ret; char *node; @@ -90,7 +90,7 @@ int resolve(const char *addr, struct sockaddr_in *sa, int flags) return 0; } -void realtime_init(struct config *g) +void init_realtime(struct config *g) { /* Prefault stack */ char dummy[MAX_SAFE_STACK]; @@ -108,7 +108,7 @@ void realtime_init(struct config *g) if (stat("/sys/kernel/realtime", &st)) warn("This is not a a realtime patched kernel!"); else - debug(3 ,"This is a realtime patched kernel"); + debug(3, "This is a realtime patched kernel"); /* Use FIFO scheduler with realtime priority */ struct sched_param param;