[Olsr-cvs] olsrd-current/lib/txtinfo/src olsrd_txtinfo.c, 1.15, 1.16

[Bernd Petrovitsch]

Update of /cvsroot/olsrd/olsrd-current/lib/txtinfo/src
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv1006/lib/txtinfo/src

Modified Files:
	olsrd_txtinfo.c 
Log Message:
Bug Fixes (of stupid and forgotten bugs) from Sven-Ola Tücke <(spam-protected)> from
http://download-master.berlin.freifunk.net/sven-ola/nylon/packages/olsrd/files/102-olsrd-cvs-fixes.patch



Index: olsrd_txtinfo.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/lib/txtinfo/src/olsrd_txtinfo.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** olsrd_txtinfo.c	8 Nov 2007 22:47:41 -0000	1.15
--- olsrd_txtinfo.c	29 Nov 2007 00:10:17 -0000	1.16
***************
*** 298,302 ****
  static void ipc_print_neigh_link(void)
  {
!     struct ipaddr_str buf;
      struct neighbor_entry *neigh;
      struct neighbor_2_list_entry *list_2;
--- 298,302 ----
  static void ipc_print_neigh_link(void)
  {
!     struct ipaddr_str buf1, buf2;
      struct neighbor_entry *neigh;
      struct neighbor_2_list_entry *list_2;
***************
*** 310,315 ****
      while(link)	{
  	ipc_sendf( "%s\t%s\t%0.2f\t%0.2f\t%d\t%d\t%0.2f\t%0.2f\t\n",
!                    olsr_ip_to_string(&buf, &link->local_iface_addr),
!                    olsr_ip_to_string(&buf, &link->neighbor_iface_addr),
                     link->L_link_quality, 
                     link->loss_link_quality,
--- 310,315 ----
      while(link)	{
  	ipc_sendf( "%s\t%s\t%0.2f\t%0.2f\t%d\t%d\t%0.2f\t%0.2f\t\n",
!                    olsr_ip_to_string(&buf1, &link->local_iface_addr),
!                    olsr_ip_to_string(&buf2, &link->neighbor_iface_addr),
                     link->L_link_quality, 
                     link->loss_link_quality,
***************
*** 328,332 ****
              neigh = neigh->next) {
              ipc_sendf("%s\t%s\t%s\t%s\t%d\t", 
!                       olsr_ip_to_string(&buf, &neigh->neighbor_main_addr),
                        (neigh->status == SYM) ? "YES" : "NO",
                        neigh->is_mpr ? "YES" : "NO",
--- 328,332 ----
              neigh = neigh->next) {
              ipc_sendf("%s\t%s\t%s\t%s\t%d\t", 
!                       olsr_ip_to_string(&buf1, &neigh->neighbor_main_addr),
                        (neigh->status == SYM) ? "YES" : "NO",
                        neigh->is_mpr ? "YES" : "NO",
***************
*** 339,343 ****
                  list_2 = list_2->next)
                  {
!                     //size += sprintf(&buf[size], "<option>%s</option>\n", olsr_ip_to_string(&buf, &list_2->neighbor_2->neighbor_2_addr));
                      thop_cnt ++;
                  }
--- 339,343 ----
                  list_2 = list_2->next)
                  {
!                     //size += sprintf(&buf[size], "<option>%s</option>\n", olsr_ip_to_string(&buf1, &list_2->neighbor_2->neighbor_2_addr));
                      thop_cnt ++;
                  }
***************
*** 350,354 ****
  static void ipc_print_routes(void)
  {
!     struct ipaddr_str buf;
      struct rt_entry *rt;
      struct avl_node *rt_tree_node;
--- 350,354 ----
  static void ipc_print_routes(void)
  {
!     struct ipaddr_str buf1, buf2;
      struct rt_entry *rt;
      struct avl_node *rt_tree_node;
***************
*** 364,370 ****
  
          ipc_sendf( "%s/%d\t%s\t%d\t%.3f\t%s\t\n",
!                    olsr_ip_to_string(&buf, &rt->rt_dst.prefix),
                     rt->rt_dst.prefix_len,
!                    olsr_ip_to_string(&buf, &rt->rt_best->rtp_nexthop.gateway),
                     rt->rt_best->rtp_metric.hops,
                     rt->rt_best->rtp_metric.etx,
--- 364,370 ----
  
          ipc_sendf( "%s/%d\t%s\t%d\t%.3f\t%s\t\n",
!                    olsr_ip_to_string(&buf1, &rt->rt_dst.prefix),
                     rt->rt_dst.prefix_len,
!                    olsr_ip_to_string(&buf2, &rt->rt_best->rtp_nexthop.gateway),
                     rt->rt_best->rtp_metric.hops,
                     rt->rt_best->rtp_metric.etx,