[Olsr-cvs] olsrd-current/src/cfgparser olsrd_conf.c,1.47,1.48

[Thomas Lopatic]

Update of /cvsroot/olsrd/olsrd-current/src/cfgparser
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7886/src/cfgparser

Modified Files:
	olsrd_conf.c 
Log Message:
Make conversion of default IPv6 addresses fail silently. On IPv6-capable
systems this never fails. This only fails on systems that do not support
AF_INET6 and made olsrd unusable with ulibc.


Index: olsrd_conf.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/cfgparser/olsrd_conf.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** olsrd_conf.c	7 Jan 2006 08:16:24 -0000	1.47
--- olsrd_conf.c	9 Mar 2006 15:05:27 -0000	1.48
***************
*** 481,496 ****
    io->ipv6_addrtype = 1; /* XXX - FixMe */
  
!   if(inet_pton(AF_INET6, OLSR_IPV6_MCAST_SITE_LOCAL, &in6) < 0)
!     {
!       fprintf(stderr, "Failed converting IP address %s\n", OLSR_IPV6_MCAST_SITE_LOCAL);
!       return NULL;
!     }
    memcpy(&io->ipv6_multi_site.v6, &in6, sizeof(struct in6_addr));
  
!   if(inet_pton(AF_INET6, OLSR_IPV6_MCAST_GLOBAL, &in6) < 0)
!     {
!       fprintf(stderr, "Failed converting IP address %s\n", OLSR_IPV6_MCAST_GLOBAL);
!       return NULL;
!     }
    memcpy(&io->ipv6_multi_glbl.v6, &in6, sizeof(struct in6_addr));
  
--- 481,488 ----
    io->ipv6_addrtype = 1; /* XXX - FixMe */
  
!   inet_pton(AF_INET6, OLSR_IPV6_MCAST_SITE_LOCAL, &in6);
    memcpy(&io->ipv6_multi_site.v6, &in6, sizeof(struct in6_addr));
  
!   inet_pton(AF_INET6, OLSR_IPV6_MCAST_GLOBAL, &in6);
    memcpy(&io->ipv6_multi_glbl.v6, &in6, sizeof(struct in6_addr));