[Olsr-cvs] olsrd-current/lib/httpinfo/src olsrd_httpinfo.c, 1.84, 1.85

[Bernd Petrovitsch]

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

Modified Files:
	olsrd_httpinfo.c 
Log Message:
* do not print / in the routeing table

Index: olsrd_httpinfo.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/lib/httpinfo/src/olsrd_httpinfo.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -C2 -d -r1.84 -r1.85
*** olsrd_httpinfo.c	8 Nov 2007 23:33:54 -0000	1.84
--- olsrd_httpinfo.c	11 Nov 2007 22:00:39 -0000	1.85
***************
*** 312,316 ****
  
    addrlen = sizeof(struct sockaddr_in);
!   if ((client_sockets[curr_clients] = accept(fd, (struct sockaddr *)  &pin, &addrlen)) == -1) {
      olsr_printf(1, "(HTTPINFO) accept: %s\n", strerror(errno));
      goto close_connection;
--- 312,317 ----
  
    addrlen = sizeof(struct sockaddr_in);
!   client_sockets[curr_clients] = accept(fd, (struct sockaddr *)  &pin, &addrlen);
!   if (client_sockets[curr_clients] == -1) {
      olsr_printf(1, "(HTTPINFO) accept: %s\n", strerror(errno));
      goto close_connection;
***************
*** 631,635 ****
    size += snprintf(&buf[size], bufsize-size, "%s", ipaddrstr);
    /* print ip address or ip prefix ? */
!   if (prefix_len != -1) {
        size += snprintf(&buf[size], bufsize-size, "/%d", prefix_len);
    }
--- 632,636 ----
    size += snprintf(&buf[size], bufsize-size, "%s", ipaddrstr);
    /* print ip address or ip prefix ? */
!   if (prefix_len != -1 && prefix_len != olsr_cnf->maxplen) {
        size += snprintf(&buf[size], bufsize-size, "/%d", prefix_len);
    }
***************
*** 693,697 ****
                                   rt->rt_dst.prefix_len);
    size += build_ipaddr_with_link(&buf[size], bufsize-size,
!                                  &rt->rt_best->rtp_nexthop.gateway, -1);
  
    size += snprintf(&buf[size], bufsize-size,
--- 694,699 ----
                                   rt->rt_dst.prefix_len);
    size += build_ipaddr_with_link(&buf[size], bufsize-size,
!                                  &rt->rt_best->rtp_nexthop.gateway,
!                                  -1);
  
    size += snprintf(&buf[size], bufsize-size,