[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/net/ctp CtpForwardingEngineP.nc, 1.6, 1.7 CtpRoutingEngineP.nc, 1.7, 1.8

[Phil Levis]

Update of /cvsroot/tinyos/tinyos-2.x/tos/lib/net/ctp
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27056/tos/lib/net/ctp

Modified Files:
	CtpForwardingEngineP.nc CtpRoutingEngineP.nc 
Log Message:
The big interface switchover for Packet, Send, Receive, and AMSend.


Index: CtpForwardingEngineP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/ctp/CtpForwardingEngineP.nc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CtpForwardingEngineP.nc	16 Jan 2007 04:39:20 -0000	1.6
--- CtpForwardingEngineP.nc	13 Sep 2007 23:10:18 -0000	1.7
***************
*** 293,297 ****
  
    ctp_data_header_t* getHeader(message_t* m) {
!     return (ctp_data_header_t*)call SubPacket.getPayload(m, NULL);
    }
   
--- 293,297 ----
  
    ctp_data_header_t* getHeader(message_t* m) {
!     return (ctp_data_header_t*)call SubPacket.getPayload(m, sizeof(ctp_data_header_t));
    }
   
***************
*** 359,364 ****
    }
  
!   command void* Send.getPayload[uint8_t client](message_t* msg) {
!     return call Packet.getPayload(msg, NULL);
    }
  
--- 359,364 ----
    }
  
!   command void* Send.getPayload[uint8_t client](message_t* msg, uint8_t len) {
!     return call Packet.getPayload(msg, len);
    }
  
***************
*** 460,465 ****
          dbg("Forwarder", "%s: I'm a root, so loopback and signal receive.\n", __FUNCTION__);
          loopbackMsgPtr = signal Receive.receive[collectid](loopbackMsgPtr,
! 							  call Packet.getPayload(loopbackMsgPtr, NULL), 
! 							  call Packet.payloadLength(loopbackMsgPtr));
          signal SubSend.sendDone(qe->msg, SUCCESS);
          return;
--- 460,465 ----
          dbg("Forwarder", "%s: I'm a root, so loopback and signal receive.\n", __FUNCTION__);
          loopbackMsgPtr = signal Receive.receive[collectid](loopbackMsgPtr,
! 							   call Packet.getPayload(loopbackMsgPtr, call Packet.payloadLength(loopbackMsgPtr)), 
! 							   call Packet.payloadLength(loopbackMsgPtr));
          signal SubSend.sendDone(qe->msg, SUCCESS);
          return;
***************
*** 728,732 ****
    event message_t* 
    SubReceive.receive(message_t* msg, void* payload, uint8_t len) {
-     uint8_t netlen;
      collection_id_t collectid;
      bool duplicate = FALSE;
--- 728,731 ----
***************
*** 776,786 ****
      else if (call RootControl.isRoot())
        return signal Receive.receive[collectid](msg, 
!                         call Packet.getPayload(msg, &netlen), 
!                         call Packet.payloadLength(msg));
      // I'm on the routing path and Intercept indicates that I
      // should not forward the packet.
      else if (!signal Intercept.forward[collectid](msg, 
!                         call Packet.getPayload(msg, &netlen), 
!                         call Packet.payloadLength(msg)))
        return msg;
      else {
--- 775,785 ----
      else if (call RootControl.isRoot())
        return signal Receive.receive[collectid](msg, 
! 					       call Packet.getPayload(msg, call Packet.payloadLength(msg)), 
! 					       call Packet.payloadLength(msg));
      // I'm on the routing path and Intercept indicates that I
      // should not forward the packet.
      else if (!signal Intercept.forward[collectid](msg, 
! 						  call Packet.getPayload(msg, call Packet.payloadLength(msg)), 
! 						  call Packet.payloadLength(msg)))
        return msg;
      else {
***************
*** 790,812 ****
    }
  
-   command void* 
-   Receive.getPayload[collection_id_t id](message_t* msg, uint8_t* len) {
-     return call Packet.getPayload(msg, NULL);
-   }
- 
-   command uint8_t
-   Receive.payloadLength[collection_id_t id](message_t *msg) {
-     return call Packet.payloadLength(msg);
-   }
- 
-   command void *
-   Snoop.getPayload[collection_id_t id](message_t *msg, uint8_t *len) {
-     return call Packet.getPayload(msg, NULL);
-   }
- 
-   command uint8_t Snoop.payloadLength[collection_id_t id](message_t *msg) {
-     return call Packet.payloadLength(msg);
-   }
- 
    event message_t* 
    SubSnoop.receive(message_t* msg, void *payload, uint8_t len) {
--- 789,792 ----
***************
*** 871,880 ****
    }
  
!   command void* Packet.getPayload(message_t* msg, uint8_t* len) {
!     uint8_t* payload = call SubPacket.getPayload(msg, len);
!     if (len != NULL) {
!       *len -= sizeof(ctp_data_header_t);
      }
!     return payload + sizeof(ctp_data_header_t);
    }
  
--- 851,860 ----
    }
  
!   command void* Packet.getPayload(message_t* msg, uint8_t len) {
!     uint8_t* payload = call SubPacket.getPayload(msg, len + sizeof(ctp_data_header_t));
!     if (payload != NULL) {
!       payload += sizeof(ctp_data_header_t);
      }
!     return payload;
    }
  

Index: CtpRoutingEngineP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/ctp/CtpRoutingEngineP.nc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CtpRoutingEngineP.nc	21 Apr 2007 07:02:37 -0000	1.7
--- CtpRoutingEngineP.nc	13 Sep 2007 23:10:18 -0000	1.8
***************
*** 208,212 ****
          routingTableInit();
          my_ll_addr = call AMPacket.address();
!         beaconMsg = call BeaconSend.getPayload(&beaconMsgBuffer);
          maxLength = call BeaconSend.maxPayloadLength();
          dbg("TreeRoutingCtl","TreeRouting initialized. (used payload:%d max payload:%d!\n", 
--- 208,212 ----
          routingTableInit();
          my_ll_addr = call AMPacket.address();
!         beaconMsg = call BeaconSend.getPayload(&beaconMsgBuffer, call BeaconSend.maxPayloadLength());
          maxLength = call BeaconSend.maxPayloadLength();
          dbg("TreeRoutingCtl","TreeRouting initialized. (used payload:%d max payload:%d!\n", 
***************
*** 455,459 ****
  
      ctp_routing_header_t* getHeader(message_t* m) {
!       return (ctp_routing_header_t*)call BeaconReceive.getPayload(m, NULL);
      }
      
--- 455,459 ----
  
      ctp_routing_header_t* getHeader(message_t* m) {
!       return (ctp_routing_header_t*)call BeaconSend.getPayload(m, call BeaconSend.maxPayloadLength());
      }