diff --git a/core/net/Makefile.uip b/core/net/Makefile.uip index 6c02d6016..29b5de528 100644 --- a/core/net/Makefile.uip +++ b/core/net/Makefile.uip @@ -1,6 +1,5 @@ NET = \ dhcpc.c \ -hc.c \ nbr-table.c \ netstack.c \ packetbuf.c \ diff --git a/core/net/hc.c b/core/net/hc.c deleted file mode 100644 index d193c7e7e..000000000 --- a/core/net/hc.c +++ /dev/null @@ -1,208 +0,0 @@ -/* - * Copyright (c) 2005, Swedish Institute of Computer Science - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Institute nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * This file is part of the Contiki operating system. - * - */ - -/** - * \file - * TCP/IP header compression implementation - * \author Adam Dunkels - * - */ - -#include "net/hc.h" - -#include "net/uip.h" - -#include - -#define FLAGS_COMPRESSED 0x8000 -#define FLAGS_BROADCASTDATA 0x4000 - -struct hc_hdr { - uint16_t flagsport; - uip_ipaddr_t srcipaddr; -}; - -struct udpip_hdr { - /* IP header. */ - uint8_t vhl, - tos, - len[2], - ipid[2], - ipoffset[2], - ttl, - proto; - uint16_t ipchksum; - uip_ipaddr_t srcipaddr, destipaddr; - - /* UDP header. */ - uint16_t srcport, - destport; - uint16_t udplen; - uint16_t udpchksum; -}; - -#include - -/*---------------------------------------------------------------------------*/ -/** - * Initialize the header compression module. - */ -/*---------------------------------------------------------------------------*/ -void -hc_init(void) -{ - -} -/*---------------------------------------------------------------------------*/ -/** - * Compress a header - * - * This function compresses the TCP/IP headers in a buffer and - * should be called just before sending out data on the network. A - * pointer to the compressed header is returned, and len is - * adjusted. - * - * If the header could not be compressed, the function does nothing - * and returns a NULL pointer. - * - * \return A pointer to the start of the compressed header or NULL if - * the header could not be compressed. - */ -/*---------------------------------------------------------------------------*/ -int -hc_compress(uint8_t *buf, int len) -{ - struct hc_hdr *hdr; - struct udpip_hdr *uhdr; - - hdr = (struct hc_hdr *)buf; - uhdr = (struct udpip_hdr *)buf; - - /* Check the original TCP/IP header to see if it matches our - pattern, and compress if it does. */ - - if(uhdr->vhl == 0x45 && /* Only IPv4 without - options. */ - uhdr->len[0] == 0x00 && /* Only packets < 256 - bytes long. */ - uhdr->ipoffset[0] == 0x00 && /* No fragmented IP - packets. */ - uhdr->ipoffset[1] == 0x00 && /* No fragmented IP - packets. */ - uhdr->proto == UIP_PROTO_UDP && /* Only UDP packets. */ - uip_ipaddr_cmp(&uhdr->destipaddr, &uip_broadcast_addr) && /* Only - link-local broadcast - packets. */ - uhdr->destport == uhdr->srcport && /* Only packets with - the same destination - and source port - number. */ - (uhdr->destport & UIP_HTONS(0xc000)) == 0) { /* Only packets with the two - highest bits in the port - number equal to zero. */ - - hdr->flagsport = uip_htons( - FLAGS_COMPRESSED | /* Compressed header. */ - FLAGS_BROADCASTDATA | /* Broadcast data. */ - (uip_htons(uhdr->destport) & 0x3fff)); - uip_ipaddr_copy(&hdr->srcipaddr, &uhdr->srcipaddr); - - /* Move the packet data to the end of the compressed header. */ - memcpy((char *)hdr + HC_HLEN, - &buf[UIP_IPUDPH_LEN], - len - UIP_IPUDPH_LEN); - - /* Return the new packet length. */ - return len - (UIP_IPUDPH_LEN - HC_HLEN); - } - - /* No compression possible, return NULL pointer. */ - return len; - -} -/*---------------------------------------------------------------------------*/ -/** - * Inflate (decompress) a header - * - * This function should be called to inflate a possibly compressed - * packet header just after a packet has been received from the - * network. The function will copy the packet data so that the - * original header fits and adjusts uip_len. - * - */ -/*---------------------------------------------------------------------------*/ -int -hc_inflate(uint8_t *buf, int len) -{ - struct udpip_hdr *uhdr; - struct hc_hdr *hdr; - - hdr = (struct hc_hdr *)buf; - - /* First, check if the header in buf is compressed or not. */ - if((hdr->flagsport & UIP_HTONS(FLAGS_COMPRESSED)) != 0 && - (hdr->flagsport & UIP_HTONS(FLAGS_BROADCASTDATA)) != 0) { - - /* Move packet data in memory to make room for the uncompressed header. */ - memmove(&buf[UIP_IPUDPH_LEN - HC_HLEN], - buf, len); - uhdr = (struct udpip_hdr *)buf; - hdr = (struct hc_hdr *)&buf[UIP_IPUDPH_LEN - HC_HLEN]; - - uip_ipaddr_copy(&uhdr->srcipaddr, &hdr->srcipaddr); - uhdr->srcport = hdr->flagsport & UIP_HTONS(0x3fff); - uhdr->destport = hdr->flagsport & UIP_HTONS(0x3fff); - - uhdr->udplen = len; - - len += UIP_IPUDPH_LEN - HC_HLEN; - - - uhdr->vhl = 0x45; - uhdr->tos = 0; - uhdr->len[0] = 0; - uhdr->len[1] = len; - uhdr->ipid[0] = uhdr->ipid[1] = 0xAD; - uhdr->ipoffset[0] = uhdr->ipoffset[1] = 0; - uhdr->ttl = 2; - uhdr->proto = UIP_PROTO_UDP; - uip_ipaddr_copy(&uhdr->destipaddr, &uip_broadcast_addr); - uhdr->udpchksum = 0; - - uhdr->ipchksum = 0; - uhdr->ipchksum = ~(uip_ipchksum()); - - } - - return len; -} -/*---------------------------------------------------------------------------*/ diff --git a/core/net/hc.h b/core/net/hc.h deleted file mode 100644 index 21e5e8428..000000000 --- a/core/net/hc.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2005, Swedish Institute of Computer Science - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Institute nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * This file is part of the Contiki operating system. - * - */ -/** - * \file - * TCP/IP header compression header file. - * \author Adam Dunkels - * - */ - -#ifndef __HC_H__ -#define __HC_H__ - -#include "net/uip.h" - -void hc_init(void); -int hc_compress(uint8_t *buf, int len); -int hc_inflate(uint8_t *buf, int len); - -#define HC_HLEN 6 - -#endif /* __HC_H__ */ diff --git a/core/net/rawpacket-udp.c b/core/net/rawpacket-udp.c deleted file mode 100644 index 974a4a8f3..000000000 --- a/core/net/rawpacket-udp.c +++ /dev/null @@ -1,71 +0,0 @@ -c/* - * Copyright (c) 2006, Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Institute nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * This file is part of the Contiki operating system. - * - */ - -/** - * \file - * Implementation of the raw packet API with broadcast UDP packets - * \author - * Adam Dunkels - */ - -#include "contiki.h" -#include "contiki-net.h" - -#include "net/rawpacket-udp.h" - -#define PORT 8096 - -/*---------------------------------------------------------------------------*/ -void -rawpacket_udp_init(void) -{ - -} -/*---------------------------------------------------------------------------*/ -struct rawpacket_conn * -rawpacket_setup(int id) -{ - return (struct rawpacket_conn *)udp_broadcast_new(UIP_HTONS(PORT + id), NULL); -} -/*---------------------------------------------------------------------------*/ -void -rawpacket_send(struct rawpacket_conn *c, char *data, int datalen) -{ - uip_udp_packet_send((struct uip_udp_conn *)c, data, datalen); -} -/*---------------------------------------------------------------------------*/ -int -rawpacket_received(struct rawpacket_conn *c) -{ - return uip_newdata() && (struct uip_udp_conn *)c == uip_udp_conn; -} -/*---------------------------------------------------------------------------*/ diff --git a/core/net/rawpacket-udp.h b/core/net/rawpacket-udp.h deleted file mode 100644 index e38f350a4..000000000 --- a/core/net/rawpacket-udp.h +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2006, Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Institute nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * This file is part of the Contiki operating system. - * - */ - -/** - * \file - * A brief description of what this file is. - * \author - * Adam Dunkels - */ - -#ifndef __RAWPACKET_UDP_H__ -#define __RAWPACKET_UDP_H__ - -#include "net/rawpacket.h" - -void rawpacket_udp_init(void); - -#endif /* __RAWPACKET_UDP_H__ */ diff --git a/core/net/rawpacket.h b/core/net/rawpacket.h deleted file mode 100644 index 1e30a814f..000000000 --- a/core/net/rawpacket.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (c) 2006, Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Institute nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * This file is part of the Contiki operating system. - * - */ - -/** - * \file - * Header file for the Contiki raw packet API interface - * \author - * Adam Dunkels - */ - -#ifndef __RAWPACKET_H__ -#define __RAWPACKET_H__ - -struct rawpacket_conn; - -struct rawpacket_conn *rawpacket_setup(int id); -void rawpacket_send(struct rawpacket_conn *c, char *data, int datalen); -int rawpacket_received(struct rawpacket_conn *c); - -#endif /* __RAWPACKET_H__ */ diff --git a/core/net/uip-over-mesh.c b/core/net/uip-over-mesh.c index cf204ee27..f4a1a74f1 100644 --- a/core/net/uip-over-mesh.c +++ b/core/net/uip-over-mesh.c @@ -39,7 +39,6 @@ #include -#include "net/hc.h" #include "net/uip-fw.h" #include "net/uip-over-mesh.h" #include "net/rime/route-discovery.h" @@ -105,7 +104,6 @@ recv_data(struct unicast_conn *c, const rimeaddr_t *from) } } - /* uip_len = hc_inflate(&uip_buf[UIP_LLH_LEN], uip_len);*/ PRINTF("uip-over-mesh: %d.%d: recv_data with len %d\n", rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1], uip_len); @@ -255,7 +253,6 @@ uip_over_mesh_send(void) receiver.u8[0], receiver.u8[1], uip_len); - /* uip_len = hc_compress(&uip_buf[UIP_LLH_LEN], uip_len);*/ packetbuf_copyfrom(&uip_buf[UIP_LLH_LEN], uip_len); diff --git a/platform/cooja/net/radio-uip-uaodv.c b/platform/cooja/net/radio-uip-uaodv.c index dd9a606e1..9d29048c5 100644 --- a/platform/cooja/net/radio-uip-uaodv.c +++ b/platform/cooja/net/radio-uip-uaodv.c @@ -31,7 +31,6 @@ */ #include "radio-uip-uaodv.h" -#include "net/hc.h" #include "net/uip.h" #include "net/uaodv.h" #include "net/uaodv-rt.h" diff --git a/platform/cooja/net/uip-driver.c b/platform/cooja/net/uip-driver.c index 7a3d3267d..80ea47893 100644 --- a/platform/cooja/net/uip-driver.c +++ b/platform/cooja/net/uip-driver.c @@ -39,7 +39,6 @@ #include "net/netstack.h" #include "net/uip.h" #include "net/tcpip.h" -#include "net/hc.h" #include "net/packetbuf.h" #include "net/uip-driver.h" #include