Changeset 554

Show
Ignore:
Timestamp:
04/28/08 13:56:47 (3 weeks ago)
Author:
agr
Message:

sampl p2p checkrate

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r549 r554  
    578578        nrk_led_set (RED_LED); 
    579579        check_period.secs = 0; 
    580         check_period.nano_secs = last_flood_check_rate * NANOS_PER_MS; 
     580        check_period.nano_secs = p2p_pkt.check_rate * NANOS_PER_MS; 
    581581        val = bmac_set_rx_check_rate (check_period); 
    582582 

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

    r548 r554  
    3838    p2p_pkt_out->priority = p2p_pkt_in->priority; 
    3939    p2p_pkt_out->ack_retry= p2p_pkt_in->ack_retry; 
     40    p2p_pkt_out->check_rate= p2p_pkt_in->check_rate; 
    4041 
    4142 

  • nano-RK/projects/SAMPL/include/pkt_packer.c

    r548 r554  
    220220        p2p_pkt->buf[P2P_NEXT_HOP_MAC]=p2p_pkt->next_hop_mac; 
    221221        p2p_pkt->buf[P2P_TTL]=p2p_pkt->ttl; 
     222        p2p_pkt->buf[P2P_CHECK_RATE]=p2p_pkt->check_rate; 
    222223return 1; 
    223224} 
    …… 
    238239 
    239240      p2p_pkt->ttl = p2p_pkt->buf[P2P_TTL]; 
     241      p2p_pkt->check_rate = p2p_pkt->buf[P2P_CHECK_RATE]; 
    240242      p2p_pkt->src_mac= p2p_pkt->buf[P2P_SRC_MAC]; 
    241243      p2p_pkt->dst_mac= p2p_pkt->buf[P2P_DST_MAC]; 

  • nano-RK/projects/SAMPL/include/sampl.h

    r549 r554  
    9393#define  STATS_PKT                      0X0d 
    9494#define  SUBNET_NEIGHBOR_LIST_PKT       0X0e 
    95 #define  FULL_NEIGHBOR_LIST_PKT               0X0f 
     95#define  MOBILE_NEIGHBOR_LIST_PKT     0X0f 
    9696#define  UNKNOWN_PKT                    0X10 
    9797// UNKNOWN_PKT used by phoenix etc, do not remove  
    …… 
    139139#define P2P_NEXT_HOP_MAC        12       
    140140#define P2P_TTL                 13       
    141 #define P2P_PAYLOAD_START       14 
     141#define P2P_CHECK_RATE          14 
     142#define P2P_PAYLOAD_START       15 
    142143 
    143144// Common to gateway packets 
    …… 
    269270        uint8_t last_hop_mac;    
    270271        uint8_t next_hop_mac;    
    271 //     uint8_t reply_checkrate;      
     272       uint8_t check_rate;      
    272273 
    273274