From bc97321680a8894c423d48b14fe75c3302d47c21 Mon Sep 17 00:00:00 2001
From: mlenders <mlenders@inf.fu-berlin.de>
Date: Tue, 26 Jul 2011 01:59:34 +0200
Subject: [PATCH 1/2] [*] * get_serial_*_buf() back to sixlowborder.*

---
 sys/net/sixlowpan/bordermultiplex.c | 19 -------------------
 sys/net/sixlowpan/bordermultiplex.h |  3 ---
 sys/net/sixlowpan/sixlowborder.c    | 19 +++++++++++++++++++
 sys/net/sixlowpan/sixlowborder.h    |  3 +++
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/sys/net/sixlowpan/bordermultiplex.c b/sys/net/sixlowpan/bordermultiplex.c
index 89d0c09280..4ced90f45a 100644
--- a/sys/net/sixlowpan/bordermultiplex.c
+++ b/sys/net/sixlowpan/bordermultiplex.c
@@ -14,25 +14,6 @@
 #define ESC_ESC     0xDD
 #define DC3_ESC     0xDE
 
-uint8_t serial_out_buf[BORDER_BUFFER_SIZE];
-uint8_t serial_in_buf[BORDER_BUFFER_SIZE];
-
-uint8_t *get_serial_out_buffer(int offset) {
-    if (offset > BUFFER_SIZE) {
-        return NULL;
-    }
-    
-    return &(serial_out_buf[offset]);
-}
-
-uint8_t *get_serial_in_buffer(int offset) {
-    if (offset > BUFFER_SIZE) {
-        return NULL;
-    }
-    
-    return &(serial_in_buf[offset]);
-}
-
 void demultiplex(border_packet_t *packet, int len) {
     switch (packet->type) {
         case (BORDER_PACKET_RAW_TYPE):{
diff --git a/sys/net/sixlowpan/bordermultiplex.h b/sys/net/sixlowpan/bordermultiplex.h
index eaecea05a1..eef6aad7e3 100644
--- a/sys/net/sixlowpan/bordermultiplex.h
+++ b/sys/net/sixlowpan/bordermultiplex.h
@@ -62,9 +62,6 @@ typedef struct __attribute__ ((packed)) border_context_packet_t {
 
 #define BORDER_BUFFER_SIZE (sizeof (border_l3_header_t) + MTU)
 
-uint8_t *get_serial_out_buffer(int offset);
-uint8_t *get_serial_in_buffer(int offset);
-
 void demultiplex(border_packet_t *packet, int len);
 void multiplex_send_ipv6_over_uart(struct ipv6_hdr_t *packet);
 void multiplex_send_addr_over_uart(ipv6_addr_t *addr);
diff --git a/sys/net/sixlowpan/sixlowborder.c b/sys/net/sixlowpan/sixlowborder.c
index f884db129b..5a2a95f78e 100644
--- a/sys/net/sixlowpan/sixlowborder.c
+++ b/sys/net/sixlowpan/sixlowborder.c
@@ -22,6 +22,25 @@
 char serial_reader_stack[READER_STACK_SIZE];
 uint16_t serial_reader_pid;
 
+uint8_t serial_out_buf[BORDER_BUFFER_SIZE];
+uint8_t serial_in_buf[BORDER_BUFFER_SIZE];
+
+uint8_t *get_serial_out_buffer(int offset) {
+    if (offset > BUFFER_SIZE) {
+        return NULL;
+    }
+    
+    return &(serial_out_buf[offset]);
+}
+
+uint8_t *get_serial_in_buffer(int offset) {
+    if (offset > BUFFER_SIZE) {
+        return NULL;
+    }
+    
+    return &(serial_in_buf[offset]);
+}
+
 uint16_t border_get_serial_reader() {
     return serial_reader_pid;
 }
diff --git a/sys/net/sixlowpan/sixlowborder.h b/sys/net/sixlowpan/sixlowborder.h
index 431eb0c1a4..fff418b492 100644
--- a/sys/net/sixlowpan/sixlowborder.h
+++ b/sys/net/sixlowpan/sixlowborder.h
@@ -12,6 +12,9 @@
 
 uint16_t border_get_serial_reader();
 
+uint8_t *get_serial_out_buffer(int offset);
+uint8_t *get_serial_in_buffer(int offset);
+
 uint8_t border_initialize(transceiver_type_t trans,ipv6_addr_t *border_router_addr);
 void border_send_ipv6_over_lowpan(struct ipv6_hdr_t *packet, uint8_t aro_flag, uint8_t sixco_flag);
 void border_process_lowpan(void);

From 183b3f0c1b1d040c93b86e188b7f9e7256f4c706 Mon Sep 17 00:00:00 2001
From: mlenders <mlenders@inf.fu-berlin.de>
Date: Tue, 26 Jul 2011 02:04:29 +0200
Subject: [PATCH 2/2] [sys/net/sixlowpan/bordermultiplex.h] * prepared for ABRO
 version control

---
 sys/net/sixlowpan/bordermultiplex.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sys/net/sixlowpan/bordermultiplex.h b/sys/net/sixlowpan/bordermultiplex.h
index eef6aad7e3..fd3d9476ba 100644
--- a/sys/net/sixlowpan/bordermultiplex.h
+++ b/sys/net/sixlowpan/bordermultiplex.h
@@ -43,6 +43,7 @@ typedef struct __attribute__ ((packed)) border_addr_packet_t {
     uint8_t type;
     uint8_t seq_num;
     uint8_t conftype;
+    uint16_t version;
     ipv6_addr_t addr;
 } border_addr_packet_t;
 
@@ -52,6 +53,7 @@ typedef struct __attribute__ ((packed)) border_context_packet_t {
     uint8_t seq_num;
     uint8_t conftype;
     struct border_context_t {
+        uint16_t version;
         uint8_t cid;
         ipv6_addr_t prefix;
         uint8_t length;