[ninux-dev] Fwd: [Olsr-dev] [PATCH v1 16/44] txtinfo: re-order the sent information

[Claudio Pisa]

Ciao, lista.
FYI, questa patch potrebbe dare problemi allo script:

https://github.com/ninuxorg/nodeshot/blob/0.9.x/nodeshot/scripts/read_topology_hna.py#L76

che gira attualmente su map.ninux.org

Clauz


-------- Forwarded Message --------
Subject: [Olsr-dev] [PATCH v1 16/44] txtinfo: re-order the sent information
Date: Fri, 27 Nov 2015 10:43:09 +0100
From: Ferry Huberts <mailings at hupie.com>
To: olsr-dev at lists.olsr.org

From: Ferry Huberts <ferry.huberts at pelagic.nl>

Signed-off-by: Ferry Huberts <ferry.huberts at pelagic.nl>
---
 lib/txtinfo/src/olsrd_txtinfo.c | 34 ++++++++++++----------------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/lib/txtinfo/src/olsrd_txtinfo.c
b/lib/txtinfo/src/olsrd_txtinfo.c
index f2212f7..202d013 100644
--- a/lib/txtinfo/src/olsrd_txtinfo.c
+++ b/lib/txtinfo/src/olsrd_txtinfo.c
@@ -818,43 +818,33 @@ static void send_info(unsigned int send_what, int
the_socket) {

   /* Print tables to IPC socket */

-  /* links */
-  if (send_what & SIW_LINKS)
-    ipc_print_links(&abuf);
-  /* neighbours */
   if (send_what & SIW_NEIGHBORS)
     ipc_print_neighbors(&abuf, false);
-  /* topology */
-  if (send_what & SIW_TOPOLOGY)
-    ipc_print_topology(&abuf);
-  /* hna */
+  if (send_what & SIW_LINKS)
+    ipc_print_links(&abuf);
+  if (send_what & SIW_ROUTES)
+    ipc_print_routes(&abuf);
   if (send_what & SIW_HNA)
     ipc_print_hna(&abuf);
-  /* sgw */
-  if (send_what & SIW_SGW)
-    ipc_print_sgw(&abuf);
-  /* mid */
   if (send_what & SIW_MID)
     ipc_print_mid(&abuf);
-  /* routes */
-  if (send_what & SIW_ROUTES)
-    ipc_print_routes(&abuf);
-  /* gateways */
+  if (send_what & SIW_TOPOLOGY)
+    ipc_print_topology(&abuf);
   if (send_what & SIW_GATEWAYS)
     ipc_print_gateways(&abuf);
-  /* config */
-  if (send_what & SIW_CONFIG)
-    ipc_print_olsrd_conf(&abuf);
-  /* interface */
   if (send_what & SIW_INTERFACES)
     ipc_print_interfaces(&abuf);
-  /* 2hop neighbour list */
   if (send_what & SIW_2HOP)
     ipc_print_neighbors(&abuf, true);
-  /* version */
+  if (send_what & SIW_SGW)
+    ipc_print_sgw(&abuf);
+
   if (send_what & SIW_VERSION)
     ipc_print_version(&abuf);

+  if (send_what & SIW_CONFIG)
+    ipc_print_olsrd_conf(&abuf);
+
   assert(outbuffer_count < MAX_CLIENTS);

   outbuffer[outbuffer_count] = olsr_malloc(abuf.len, PLUGIN_NAME"
output buffer");
-- 
2.5.0


-- 
Olsr-dev mailing list
Olsr-dev at lists.olsr.org
https://lists.olsr.org/mailman/listinfo/olsr-dev