? src/md5.d
? src/olsrd_plugin.d
? src/olsrd_secure.d
Index: src/olsrd_secure.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/lib/secure/src/olsrd_secure.c,v
retrieving revision 1.18
diff -C5 -r1.18 olsrd_secure.c
*** src/olsrd_secure.c	7 Jan 2006 08:17:44 -0000	1.18
--- src/olsrd_secure.c	8 Mar 2006 12:55:50 -0000
***************
*** 712,722 ****
    entry->challenge = challenge;
  
    memcpy(&entry->addr, new_host, olsr_cnf->ipsize);
  
    /* update validtime - not validated */
!   entry->conftime = GET_TIMESTAMP(EXCHANGE_HOLD_TIME * 1000);
  
    hash = olsr_hashing(new_host);
    
    /* Queue */
    timestamps[hash].next->prev = entry;
--- 712,722 ----
    entry->challenge = challenge;
  
    memcpy(&entry->addr, new_host, olsr_cnf->ipsize);
  
    /* update validtime - not validated */
!   entry->valtime = GET_TIMESTAMP(EXCHANGE_HOLD_TIME * 1000);
  
    hash = olsr_hashing(new_host);
    
    /* Queue */
    timestamps[hash].next->prev = entry;
***************
*** 950,963 ****
        entry->prev = &timestamps[hash];
      }
    else
      {
        /* Check configuration timeout */
!       if(!TIMED_OUT(&entry->conftime))
  	{
  	  /* If registered - do not accept! */
! 	  olsr_printf(1, "[ENC]Challenge from registered node...dropping!\n");
  	  return 0;
  	}
        else
  	{
  	  olsr_printf(1, "[ENC]Challenge from registered node...accepted!\n");
--- 950,963 ----
        entry->prev = &timestamps[hash];
      }
    else
      {
        /* Check configuration timeout */
!       if(!TIMED_OUT(&entry->valtime))
  	{
  	  /* If registered - do not accept! */
! 	  olsr_printf(1, "[ENC]Challenge from unregistered node...dropping!\n");
  	  return 0;
  	}
        else
  	{
  	  olsr_printf(1, "[ENC]Challenge from registered node...accepted!\n");
***************
*** 990,1000 ****
    
    entry->diff = 0;
    entry->validated = 0;
  
    /* update validtime - not validated */
!   entry->conftime = GET_TIMESTAMP(EXCHANGE_HOLD_TIME * 1000);
  
    /* Build and send response */
  
    send_cres((union olsr_ip_addr *)&msg->originator, 
  	    (union olsr_ip_addr *)&msg->destination, 
--- 990,1000 ----
    
    entry->diff = 0;
    entry->validated = 0;
  
    /* update validtime - not validated */
!   entry->valtime = GET_TIMESTAMP(EXCHANGE_HOLD_TIME * 1000);
  
    /* Build and send response */
  
    send_cres((union olsr_ip_addr *)&msg->originator, 
  	    (union olsr_ip_addr *)&msg->destination, 
***************
*** 1203,1213 ****
        tmp_list = timestamps[index].next;
        /*Traverse MID list*/
        while(tmp_list != &timestamps[index])
  	{
  	  /*Check if the entry is timed out*/
! 	  if((TIMED_OUT(&tmp_list->valtime)) && (TIMED_OUT(&tmp_list->conftime)))
  	    {
  	      entry_to_delete = tmp_list;
  	      tmp_list = tmp_list->next;
  
  	      olsr_printf(1, "[ENC]timestamp info for %s timed out.. deleting it\n", 
--- 1203,1213 ----
        tmp_list = timestamps[index].next;
        /*Traverse MID list*/
        while(tmp_list != &timestamps[index])
  	{
  	  /*Check if the entry is timed out*/
! 	  if((TIMED_OUT(&tmp_list->valtime)) /*&& (TIMED_OUT(&tmp_list->conftime))*/)
  	    {
  	      entry_to_delete = tmp_list;
  	      tmp_list = tmp_list->next;
  
  	      olsr_printf(1, "[ENC]timestamp info for %s timed out.. deleting it\n", 