[Olsr-cvs] olsrd-current/src mid_set.c,1.23,1.24

[Bernd Petrovitsch]

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

Modified Files:
	mid_set.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: mid_set.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/mid_set.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** mid_set.c	8 Nov 2007 22:47:41 -0000	1.23
--- mid_set.c	29 Nov 2007 00:10:17 -0000	1.24
***************
*** 227,236 ****
    int ne_ref_rp_count;
  #ifndef NODEBUG
!   struct ipaddr_str buf;
  #endif
    struct mid_address *adr = olsr_malloc(sizeof(struct mid_address), "Insert MID alias");
    
!   OLSR_PRINTF(1, "Inserting alias %s for ", olsr_ip_to_string(&buf, alias));
!   OLSR_PRINTF(1, "%s\n", olsr_ip_to_string(&buf, main_add));
  
    //COPY_IP(&adr->alias, alias);
--- 227,236 ----
    int ne_ref_rp_count;
  #ifndef NODEBUG
!   struct ipaddr_str buf1, buf2;
  #endif
    struct mid_address *adr = olsr_malloc(sizeof(struct mid_address), "Insert MID alias");
    
!   OLSR_PRINTF(1, "Inserting alias %s for ", olsr_ip_to_string(&buf1, alias));
!   OLSR_PRINTF(1, "%s\n", olsr_ip_to_string(&buf1, main_add));
  
    //COPY_IP(&adr->alias, alias);
***************
*** 243,247 ****
    ne_old = olsr_lookup_neighbor_table_alias(alias);
    if (ne_old != NULL) {
!      OLSR_PRINTF(2, "Remote main address change detected. Mangling neighbortable to replace %s with %s.\n", olsr_ip_to_string(&buf, alias), olsr_ip_to_string(&buf, main_add));
       olsr_delete_neighbor_table(alias);
       ne_new = olsr_insert_neighbor_table(main_add);
--- 243,247 ----
    ne_old = olsr_lookup_neighbor_table_alias(alias);
    if (ne_old != NULL) {
!      OLSR_PRINTF(2, "Remote main address change detected. Mangling neighbortable to replace %s with %s.\n", olsr_ip_to_string(&buf1, alias), olsr_ip_to_string(&buf2, main_add));
       olsr_delete_neighbor_table(alias);
       ne_new = olsr_insert_neighbor_table(main_add);