Nicolas Tsiftes | 1 May 01:10 2010
Picon
Picon

contiki-2.x/core/net/rpl rpl-icmp6.c,1.2,1.3

Update of /cvsroot/contiki/contiki-2.x/core/net/rpl
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv15353

Modified Files:
	rpl-icmp6.c 
Log Message:

Index: rpl-icmp6.c
===================================================================
RCS file: /cvsroot/contiki/contiki-2.x/core/net/rpl/rpl-icmp6.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** rpl-icmp6.c	30 Apr 2010 15:04:47 -0000	1.2
--- rpl-icmp6.c	30 Apr 2010 23:10:45 -0000	1.3
***************
*** 41,45 ****
   *
   * \author Joakim Eriksson <joakime@...>, Nicolas Tsiftes <nvt@...>
!  * Contributors: Niclas Finne <nfi@..., Joel Hoglund <joel@...>,
   *               Mathieu Pouillot <m.pouillot@...>
   */
--- 41,45 ----
   *
   * \author Joakim Eriksson <joakime@...>, Nicolas Tsiftes <nvt@...>
!  * Contributors: Niclas Finne <nfi@...>, Joel Hoglund <joel@...>,
   *               Mathieu Pouillot <m.pouillot@...>
   */
***************
*** 78,83 ****
(Continue reading)

Nicolas Tsiftes | 1 May 01:14 2010
Picon
Picon

contiki-2.x/core/net/rpl rpl-icmp6.c,1.3,1.4

Update of /cvsroot/contiki/contiki-2.x/core/net/rpl
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv16065

Modified Files:
	rpl-icmp6.c 
Log Message:
Removed return value in function that should not return a value.

Index: rpl-icmp6.c
===================================================================
RCS file: /cvsroot/contiki/contiki-2.x/core/net/rpl/rpl-icmp6.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** rpl-icmp6.c	30 Apr 2010 23:10:45 -0000	1.3
--- rpl-icmp6.c	30 Apr 2010 23:13:58 -0000	1.4
***************
*** 473,477 ****
    if(get_global_addr(&prefix) == 0) {
      PRINTF("RPL: No global address set for this node - suppressing DAO\n");
!     return 0;
    }
    memcpy(buffer + pos, &prefix, prefixlen / CHAR_BIT);
--- 473,477 ----
    if(get_global_addr(&prefix) == 0) {
      PRINTF("RPL: No global address set for this node - suppressing DAO\n");
!     return;
    }
    memcpy(buffer + pos, &prefix, prefixlen / CHAR_BIT);

(Continue reading)

Joakim Eriksson | 1 May 14:02 2010
Picon
Picon

contiki-2.x/core/net uip-ds6.h,1.4,1.5

Update of /cvsroot/contiki/contiki-2.x/core/net
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv5261

Modified Files:
	uip-ds6.h 
Log Message:
moved RPL routing state struct into uip-ds6

Index: uip-ds6.h
===================================================================
RCS file: /cvsroot/contiki/contiki-2.x/core/net/uip-ds6.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** uip-ds6.h	23 Mar 2010 14:21:04 -0000	1.4
--- uip-ds6.h	1 May 2010 12:02:25 -0000	1.5
***************
*** 221,224 ****
--- 221,244 ----
  } uip_ds6_maddr_t;

+ /** \brief define some additional RPL related route state and 
+  *  neighbor callback for RPL if RPL is defined */
+ #if UIP_CONF_IPV6_RPL
+ #ifndef UIP_DS6_ROUTE_STATE_TYPE
+ #define UIP_DS6_ROUTE_STATE_TYPE rpl_route_entry_t
+ /* Needed for the extended route entry state when using ContikiRPL */
+ typedef struct rpl_route_entry {
+   uint32_t lifetime;
+   uint32_t saved_lifetime;
(Continue reading)

Joakim Eriksson | 1 May 14:04 2010
Picon
Picon

contiki-2.x/platform/sky contiki-conf.h, 1.78, 1.79

Update of /cvsroot/contiki/contiki-2.x/platform/sky
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv5740

Modified Files:
	contiki-conf.h 
Log Message:
removed RPL routing state struct from platform config file

Index: contiki-conf.h
===================================================================
RCS file: /cvsroot/contiki/contiki-2.x/platform/sky/contiki-conf.h,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -d -r1.78 -r1.79
*** contiki-conf.h	30 Apr 2010 15:06:00 -0000	1.78
--- contiki-conf.h	1 May 2010 12:04:13 -0000	1.79
***************
*** 127,141 ****
  #define UIP_CONF_DS6_ROUTE_NBU   10

- #define UIP_DS6_ROUTE_STATE_TYPE rpl_route_entry_t
- /* Needed for the extended route entry state */
- typedef struct rpl_route_entry {
-   uint32_t lifetime;
-   uint32_t saved_lifetime;
-   void *dag;
-   uint8_t learned_from;
- } rpl_route_entry_t;
- 
- #define UIP_CONF_DS6_NEIGHBOR_STATE_CHANGED rpl_ds6_neighbor_callback
(Continue reading)

Joakim Eriksson | 1 May 15:04 2010
Picon
Picon

contiki-2.x/core/net tcpip.c,1.27,1.28

Update of /cvsroot/contiki/contiki-2.x/core/net
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv19527

Modified Files:
	tcpip.c 
Log Message:
added initialization of RPL

Index: tcpip.c
===================================================================
RCS file: /cvsroot/contiki/contiki-2.x/core/net/tcpip.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** tcpip.c	16 Mar 2010 15:41:00 -0000	1.27
--- tcpip.c	1 May 2010 13:04:31 -0000	1.28
***************
*** 77,81 ****
  extern struct uip_fallback_interface UIP_FALLBACK_INTERFACE;
  #endif
! 
  process_event_t tcpip_event;
  #if UIP_CONF_ICMP6
--- 77,83 ----
  extern struct uip_fallback_interface UIP_FALLBACK_INTERFACE;
  #endif
! #if UIP_CONF_IPV6_RPL
! void rpl_init(void);
! #endif
  process_event_t tcpip_event;
(Continue reading)

Joakim Eriksson | 1 May 15:07 2010
Picon
Picon

contiki-2.x/platform/sky contiki-sky-main.c, 1.79, 1.80

Update of /cvsroot/contiki/contiki-2.x/platform/sky
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv19952

Modified Files:
	contiki-sky-main.c 
Log Message:
removed initialization of RPL from platform main

Index: contiki-sky-main.c
===================================================================
RCS file: /cvsroot/contiki/contiki-2.x/platform/sky/contiki-sky-main.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** contiki-sky-main.c	30 Apr 2010 13:52:14 -0000	1.79
--- contiki-sky-main.c	1 May 2010 13:07:31 -0000	1.80
***************
*** 53,57 ****
  #if WITH_UIP6
  #include "net/uip-ds6.h"
- #include "net/rpl/rpl.h"
  #endif /* WITH_UIP6 */

--- 53,56 ----
***************
*** 339,346 ****
    }

- #if UIP_CONF_IPV6_RPL
-   rpl_init();
(Continue reading)

Fredrik Österlind | 2 May 11:42 2010
Picon
Picon

contiki-2.x/platform/cooja/dev moteid.c,1.2,1.3

Update of /cvsroot/contiki/contiki-2.x/platform/cooja/dev
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv18589/platform/cooja/dev

Modified Files:
	moteid.c 
Log Message:
fixed random seed for cooja motes

Index: moteid.c
===================================================================
RCS file: /cvsroot/contiki/contiki-2.x/platform/cooja/dev/moteid.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** moteid.c	28 Oct 2008 15:37:34 -0000	1.2
--- moteid.c	2 May 2010 09:42:15 -0000	1.3
***************
*** 39,42 ****
--- 39,43 ----
  int simMoteID;
  char simMoteIDChanged;
+ int simRandomSeed;

  /*-----------------------------------------------------------------------------------*/
***************
*** 46,50 ****
    if (simMoteIDChanged) {
      simMoteIDChanged = 0;
! 	random_init((simMoteID+1));
    }
(Continue reading)

Fredrik Österlind | 2 May 11:42 2010
Picon
Picon

contiki-2.x/platform/cooja contiki-cooja-main.c, 1.7, 1.8

Update of /cvsroot/contiki/contiki-2.x/platform/cooja
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv18589/platform/cooja

Modified Files:
	contiki-cooja-main.c 
Log Message:
fixed random seed for cooja motes

Index: contiki-cooja-main.c
===================================================================
RCS file: /cvsroot/contiki/contiki-2.x/platform/cooja/contiki-cooja-main.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** contiki-cooja-main.c	31 Mar 2010 09:39:46 -0000	1.7
--- contiki-cooja-main.c	2 May 2010 09:42:15 -0000	1.8
***************
*** 185,190 ****
      cooja_mt_yield();

!     /* Initialize random generator */
!     random_init(0);

      /* Start process handler */
--- 185,189 ----
      cooja_mt_yield();

!     /* Initialize random generator (moved to moteid.c) */

      /* Start process handler */
(Continue reading)

Fredrik Österlind | 2 May 11:42 2010
Picon
Picon

contiki-2.x/tools/cooja/java/se/sics/cooja/contikimote/interfaces ContikiMoteID.java, 1.7, 1.8

Update of /cvsroot/contiki/contiki-2.x/tools/cooja/java/se/sics/cooja/contikimote/interfaces
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv18647/tools/cooja/java/se/sics/cooja/contikimote/interfaces

Modified Files:
	ContikiMoteID.java 
Log Message:
set cooja mote random seed depending on simulation random seed

Index: ContikiMoteID.java
===================================================================
RCS file: /cvsroot/contiki/contiki-2.x/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiMoteID.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ContikiMoteID.java	5 Feb 2010 08:49:18 -0000	1.7
--- ContikiMoteID.java	2 May 2010 09:42:52 -0000	1.8
***************
*** 67,70 ****
--- 67,72 ----
    private int moteID = 0;

+   private Mote mote;
+   
    /**
     * Creates an interface to the mote ID at mote.
***************
*** 76,79 ****
--- 78,82 ----
     */
    public ContikiMoteID(Mote mote) {
(Continue reading)

Niclas Finne | 2 May 14:21 2010
Picon
Picon

contiki-2.x/core/net/rime queuebuf.c,1.17,1.18

Update of /cvsroot/contiki/contiki-2.x/core/net/rime
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv16180/core/net/rime

Modified Files:
	queuebuf.c 
Log Message:
Fixed conversion of packetbuf address type to address index and corrected return value

Index: queuebuf.c
===================================================================
RCS file: /cvsroot/contiki/contiki-2.x/core/net/rime/queuebuf.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** queuebuf.c	30 Apr 2010 07:29:08 -0000	1.17
--- queuebuf.c	2 May 2010 12:21:34 -0000	1.18
***************
*** 220,224 ****
  queuebuf_addr(struct queuebuf *b, uint8_t type)
  {
!   return &b->addrs[type];
  }
  /*---------------------------------------------------------------------------*/
--- 220,224 ----
  queuebuf_addr(struct queuebuf *b, uint8_t type)
  {
!   return &b->addrs[type - PACKETBUF_ADDR_FIRST].addr;
  }
  /*---------------------------------------------------------------------------*/

(Continue reading)


Gmane