txtinfo: undo output re-ordering of 4563faa
authorFerry Huberts <ferry.huberts@pelagic.nl>
Mon, 30 Nov 2015 13:18:21 +0000 (14:18 +0100)
committerFerry Huberts <ferry.huberts@pelagic.nl>
Mon, 30 Nov 2015 13:31:07 +0000 (14:31 +0100)
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
lib/txtinfo/src/olsrd_txtinfo.c

index 833a012..2eb96bd 100644 (file)
@@ -867,33 +867,31 @@ static void send_info(unsigned int send_what, int the_socket) {
 
   /* Print tables to IPC socket */
 
-  if (send_what & SIW_NEIGHBORS)
-    ipc_print_neighbors(&abuf, false);
   if (send_what & SIW_LINKS)
     ipc_print_links(&abuf);
-  if (send_what & SIW_ROUTES)
-    ipc_print_routes(&abuf);
+  if (send_what & SIW_NEIGHBORS)
+    ipc_print_neighbors(&abuf, false);
+  if (send_what & SIW_TOPOLOGY)
+    ipc_print_topology(&abuf);
   if (send_what & SIW_HNA)
     ipc_print_hna(&abuf);
+  if (send_what & SIW_SGW)
+    ipc_print_sgw(&abuf);
   if (send_what & SIW_MID)
     ipc_print_mid(&abuf);
-  if (send_what & SIW_TOPOLOGY)
-    ipc_print_topology(&abuf);
+  if (send_what & SIW_ROUTES)
+    ipc_print_routes(&abuf);
   if (send_what & SIW_GATEWAYS)
     ipc_print_gateways(&abuf);
+  if (send_what & SIW_OLSRD_CONF)
+    ipc_print_olsrd_conf(&abuf);
   if (send_what & SIW_INTERFACES)
     ipc_print_interfaces(&abuf);
   if (send_what & SIW_2HOP)
     ipc_print_neighbors(&abuf, true);
-  if (send_what & SIW_SGW)
-    ipc_print_sgw(&abuf);
-
   if (send_what & SIW_VERSION)
     ipc_print_version(&abuf);
 
-  if (send_what & SIW_OLSRD_CONF)
-    ipc_print_olsrd_conf(&abuf);
-
   if (http_headers) {
     http_header_adjust_content_length(&abuf, contentLengthPlaceholderStart, abuf.len - headerLength);
   }