Merge branch 'master' of git://github.com/markushx/tinyos-main into c…

…oap-13-update-int

.gitignore

@@ -0,0 +1,8 @@
+*.[oa]
+*~
+*.pyc
+build
+#*#
+.#*
+.gdb*
+TAGS

README.md

@@ -0,0 +1,55 @@
+
+This is the TinyOS main development GIT repository.
+
+It is hosted at https://github.com/tinyos/tinyos-main, main branch master.
+(aka gh:tinyos/tinyos-main(master))
+
+============================================================================
+
+** Where to begin: **
+
+README.md (this file).  For a general overview of what this Repo is
+  about.  This repository uses GIT as its DVCS.
+
+doc/00a_Getting_Started: Overview of getting started using git, github.
+
+doc/00b_Using_the_Repo: Using and contributing back to the central Repository.
+
+============================================================================
+
+* About tinyos-main.
+
+Long ago (well not that long ago), in a galaxy not too distant, tinyos
+development was hosted on Google Code as the subversion repository, 
+tinyos-main.googlecode.com/svn/trunk.  This repository is writeable by a 
+select group of core developers.
+
+TinyOS development is moving to a fully distributed model to encourage more
+participation and is switching to the GIT distributed version control system
+to support this.
+
+To ease the transition the gh:tinyos/tinyos-main repository will support very
+similar access mechanisms as currently being used to write to the tinyos-main
+subversion repository.  The core group of lead developers has push (write)
+permission to the main development repository.
+
+
+* Repo Structure
+
+Currently there is a single mainline, master.  gh:tinyos/tinyos-main(master).
+This is equivilent to the tip of the svn trunk.
+
+Branches are very inexpensive and are encouraged for any significant development.
+Typically, a feature will be implemented on a topic branch, ie. <feature>-int.
+where <int> stands for integration.
+
+For the immediate future, branching should be done in private user repositories
+until the community gets used to how they work.
+
+The general form for a repository/branch reference is: <github_context>/<repo>(branch)
+ie. gh:tinyos/tinyos-main(master) is the master branch in the tinyos/tinyos-main 
+repository.   Note that github repositories have a specific default branch controlled
+by github repository settings.   gh:tinyos/tinyos-main refers to the repository but
+if that repository is pulled it will reference the default branch.
+
+Local repositories are referenced using local(branch).

README → README.tinyos

@@ -1,6 +1,6 @@
-This contains the TinyOS 2.0 source code as of
+This contains the TinyOS 2.0 source code as of version 2.1.2 on
 
-$Date: 2007-07-30 07:18:52 $
+$Date: 2012-08-08 07:18:52 $
 
 This tree includes the TinyOS 2.0 documentation in tinyos-2.x/doc; 
 you can also find the documentation online at:

apps/PPPSniffer/Makefile

@@ -0,0 +1,29 @@
+COMPONENT=PPPSnifferC
+
+# this is necessary, otherwise we will allocate a heap by including
+# the lowpan target
+CFLAGS += -DNO_IP_MALLOC
+
+# this aligns the 802.15.4 payload on the data field of a message_t.
+# very convenient for forwarding, and means we don't have to do a
+# memmove.  This doesn't mean that motes running blip also need this--
+# they can use IFRAMES or IEEE154FRAMES
+#CFLAGS += -DIEEE154FRAMES_ENABLED
+
+#enable capturing in CC2420XDriverLayerP.nc
+CFLAGS += -DPPPSNIFFER
+
+# also receive big blip packets....
+CFLAGS += -DTOSH_DATA_LENGTH=120
+
+CFLAGS += -DCC2420X_DEF_CHANNEL=26
+
+TOSMAKE_PATH += .
+CFLAGS += -I$(TOSDIR)/lib/diagmsg
+PFLAGS += -I$(TOSDIR)/lib/ppp
+PFLAGS += -I$(TOSDIR)/lib/fragpool
+
+# -Os breaks the PPP or serial stack somehow...
+OPTFLAGS += -O2
+
+include $(MAKERULES)

apps/PPPSniffer/NOTES

@@ -0,0 +1,7 @@
+KNOWN ISSUES:
+* FCS calculation is wrong (ignore the BAD FCS in Wireshark for now)
+* Wireshark by default uses IPv6 dissector and not the 802.15.4 dissector
+  (fix would need to modify pppd)
+
+TODO:
+* check with non-cc2420x rfxlink platforms

apps/PPPSniffer/PPPSnifferC.nc

@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2008 The Regents of the University  of California.
+ * Copyright (c) 2002-2003 Intel Corporation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - 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.
+ * - Neither the name of the copyright holders 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
+ */
+
+/**
+ * The TinyOS 2.x PPPSniffer snoops AM and bare 802.15.4 packets and
+ * delivers them over ppp to the host computer. On the host wireshark
+ * can pick the packets up on the ppp interface.
+ *
+ * @author Markus Becker
+ * @author Phil Buonadonna
+ * @author Gilman Tolle
+ * @author David Gay
+ * @author Philip Levis
+ * @date January 3 2011
+ */
+//#include "ppp.h"
+#include <Ieee154.h>
+
+configuration PPPSnifferC {
+}
+implementation {
+
+    /*
+#define UQ_METADATA_FLAGS       "UQ_METADATA_FLAGS"
+#define UQ_RADIO_ALARM          "UQ_RADIO_ALARM"
+    */
+    components MainC, PPPSnifferP, LedsC;//, AssertC;
+
+    PPPSnifferP.Boot -> MainC;
+    /*
+    PPPSnifferP.Leds -> LedsC;
+    */
+    //PPPSnifferP.SplitControl -> SerialActiveMessageC;
+    components ActiveMessageC as MessageC;
+    PPPSnifferP.MessageControl -> MessageC;
+    PPPSnifferP.Packet -> MessageC.Packet;
+    //PPPSnifferP.Receive -> MessageC.Receive;
+
+    /* Serial stack */
+    /*
+    components PppDaemonC;
+    PPPSnifferP.PppSplitControl -> PppDaemonC;
+
+    components PlatformSerialHdlcUartC;
+    PppDaemonC.HdlcUart -> PlatformSerialHdlcUartC;
+    PppDaemonC.UartControl -> PlatformSerialHdlcUartC;
+    */
+    /* Link in RFC5072 support for both the control and network protocols */
+    /*
+    components PppIpv6C;
+    PppDaemonC.PppProtocol[PppIpv6C.ControlProtocol] -> PppIpv6C.PppControlProtocol;
+    PppDaemonC.PppProtocol[PppIpv6C.Protocol] -> PppIpv6C.PppProtocol;
+    PppIpv6C.Ppp -> PppDaemonC;
+    PppIpv6C.LowerLcpAutomaton -> PppDaemonC;
+    PPPSnifferP.Ipv6LcpAutomaton -> PppIpv6C;
+    PPPSnifferP.PppIpv6 -> PppIpv6C;
+    */
+    /* Link in the custom protocol for printf support */
+    /*
+    components PppPrintfC;
+    PppPrintfC.Ppp -> PppDaemonC;
+    PppDaemonC.PppProtocol[PppPrintfC.Protocol] -> PppPrintfC;
+    */
+}