Changeset 558

Show
Ignore:
Timestamp:
04/29/08 16:36:05 (2 weeks ago)
Author:
agr
Message:

sampl p2p bug fix

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • nano-RK/projects/SAMPL/client/main.c

    r555 r558  
    463463  mobile_reserve=nrk_reserve_create(); 
    464464  if(mobile_reserve==NRK_ERROR) nrk_kprintf( PSTR( "Error creating mobile node reserve\r\n" )); 
    465   val=nrk_reserve_set(mobile_reserve, &timeout,10, NULL); 
     465  val=nrk_reserve_set(mobile_reserve, &timeout,30, NULL); 
    466466  if(val==NRK_ERROR) nrk_kprintf( PSTR( "Error setting mobile node reserve\r\n" )); 
    467467 

  • nano-RK/projects/SAMPL/client/p2p_handler.c

    r554 r558  
    107107#endif 
    108108    // No clue what this packet is, so just forward it  
     109    p2p_pkt_out->subnet_mac[0] = p2p_pkt_in->subnet_mac[0]; 
     110    p2p_pkt_out->subnet_mac[1] = p2p_pkt_in->subnet_mac[1]; 
     111    p2p_pkt_out->subnet_mac[2] = p2p_pkt_in->subnet_mac[2]; 
    109112    for(i=0; i<p2p_pkt_in->payload_len; i++ ) 
    110113            p2p_pkt_out->payload[i]=p2p_pkt_in->payload[i]; 
    …… 
    118121    // If the packet isn't for my handler, just copy it for forwarding 
    119122    // Routing should have been correctly set above 
     123    p2p_pkt_out->subnet_mac[0] = p2p_pkt_in->subnet_mac[0]; 
     124    p2p_pkt_out->subnet_mac[1] = p2p_pkt_in->subnet_mac[1]; 
     125    p2p_pkt_out->subnet_mac[2] = p2p_pkt_in->subnet_mac[2]; 
    120126    for(i=0; i<p2p_pkt_in->payload_len; i++ ) 
    121127            p2p_pkt_out->payload[i]=p2p_pkt_in->payload[i];