Skip to content
Snippets Groups Projects
Commit e6b5d705 authored by Jakob Olsson's avatar Jakob Olsson
Browse files

small fixes

parent e6a08bc2
No related branches found
No related tags found
No related merge requests found
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
struct ubus_context *ctx; struct ubus_context *ctx;
int debug; int debug;
struct uloop_timeout timeout = { .cb = status }; struct uloop_timeout timeout = { .cb = devices_status };
static struct option long_options[] = { static struct option long_options[] = {
{"debug", required_argument, NULL, 'd'}, {"debug", required_argument, NULL, 'd'},
......
...@@ -58,10 +58,9 @@ int add_device(char *name, char *ip) ...@@ -58,10 +58,9 @@ int add_device(char *name, char *ip)
{ {
struct device *dev; struct device *dev;
/* Either do this here, or send an ENUM {FIND, FIND_INCREMENT} flag to search? */
dev = search_list(name); dev = search_list(name);
if (dev) { if (dev) {
dev->current_pass = true; dev->present = true;
goto fail; goto fail;
} }
dev = malloc(sizeof(struct device)); dev = malloc(sizeof(struct device));
...@@ -71,7 +70,7 @@ int add_device(char *name, char *ip) ...@@ -71,7 +70,7 @@ int add_device(char *name, char *ip)
goto fail; goto fail;
} }
dev->current_pass = true; dev->present = true;
dev->name = name; dev->name = name;
dev->ip = ip; dev->ip = ip;
list_add(&dev->list, &devices); list_add(&dev->list, &devices);
...@@ -188,7 +187,7 @@ int get_devices(void) ...@@ -188,7 +187,7 @@ int get_devices(void)
} }
while ((de = readdir(dr)) != NULL) { while ((de = readdir(dr)) != NULL) {
if(strcmp(de->d_name, ".") == 0 || strcmp(de->d_name, "..") == 0) if (strcmp(de->d_name, ".") == 0 || strcmp(de->d_name, "..") == 0)
continue; continue;
if (fstatat(dirfd(dr), de->d_name, &st, 0) < 0) { if (fstatat(dirfd(dr), de->d_name, &st, 0) < 0) {
......
...@@ -12,9 +12,9 @@ struct device { ...@@ -12,9 +12,9 @@ struct device {
int expose_infrastructure_object(struct ubus_context *ctx); int expose_infrastructure_object(struct ubus_context *ctx);
int get_devices(void); int get_devices(void);
int status(struct uloop_timeout *t); int devices_status(struct uloop_timeout *t);
char *get_device_ip(char *device_name); char *get_device_ip(char *device_name);
int find_missing_devices(void); int tag_missing_devices(void);
int add_device(char *name, char *ip); int add_device(char *name, char *ip);
int delete_device_by_name(char *name); int delete_device_by_name(char *name);
int delete_device_by_obj(struct device *dev); int delete_device_by_obj(struct device *dev);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment