Difuse/routing
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #6 from mmunz/master

Browse source 
Fix a regression in the jsoninfo plugin which was introduced in olsrd 0.6.6
This commit is contained in:
Saverio Proto 2013-08-26 03:08:31 -07:00
commit dbb0fbc5a9
1 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
olsrd/patches/001-fix-jsoninfo.patch Normal file
View file

@ -0,0 +1,22 @@
diff --git a/lib/jsoninfo/src/olsrd_jsoninfo.c b/lib/jsoninfo/src/olsrd_jsoninfo.c
index 3f7b7b9..966292c 100644
--- a/lib/jsoninfo/src/olsrd_jsoninfo.c
+++ b/lib/jsoninfo/src/olsrd_jsoninfo.c
@@ -1283,7 +1283,7 @@ send_info(unsigned int send_what, int the_socket)
abuf_init(&abuf, 32768);
// only add if outputing JSON
- if (send_what & SIW_ALL) abuf_json_open_array_entry(&abuf);
+ if (send_what & SIW_ALL) abuf_puts(&abuf, "{");
if ((send_what & SIW_LINKS) == SIW_LINKS) ipc_print_links(&abuf);
if ((send_what & SIW_NEIGHBORS) == SIW_NEIGHBORS) ipc_print_neighbors(&abuf);
@@ -1305,7 +1305,7 @@ send_info(unsigned int send_what, int the_socket)
abuf_json_int(&abuf, "timeSinceStartup", now_times);
if(*uuid != 0)
abuf_json_string(&abuf, "uuid", uuid);
- abuf_json_close_array_entry(&abuf);
+ abuf_puts(&abuf, "}\n");
}
/* this outputs the olsrd.conf text directly, not JSON */