Merge pull request RIOT-OS#5148 from OlegHahm/ccnl_update

pkg ccn-lite: update version

Author: OlegHahm

Makefile.dep

@@ -6,6 +6,11 @@ ifneq (,$(filter libcoap,$(USEPKG)))
     USEMODULE += gnrc_conn_udp
 endif
 
+ifneq (,$(filter ccn-lite,$(USEPKG)))
+    export CFLAGS += -DCCNL_RIOT
+endif
+
+
 ifneq (,$(filter nhdp,$(USEMODULE)))
   USEMODULE += conn_udp
   USEMODULE += xtimer

examples/ccn-lite-relay/Makefile

@@ -11,12 +11,10 @@ RIOTBASE ?= $(CURDIR)/../..
 
 CFLAGS += -DDEVELHELP
 CFLAGS += -DUSE_LINKLAYER
-CFLAGS += -DUSE_IPV6
 CFLAGS += -DCCNL_UAPI_H_
 CFLAGS += -DUSE_SUITE_NDNTLV
 CFLAGS += -DNEEDS_PREFIX_MATCHING
 CFLAGS += -DNEEDS_PACKET_CRAFTING
-CFLAGS += -DUSE_HMAC256
 
 # Change this to 0 show compiler invocation lines by default:
 QUIET ?= 1

examples/ccn-lite-relay/README.md

@@ -16,19 +16,31 @@ RIOT provides three shell to interact with the CCN-Lite stack:
                 incorrect ID, you should get an error message.) You have to
                 call this command, before you can actually send or receive
                 anything.
-* `ccnl_int` - generates and sends out an Interest. The command expects one
-               mandatory and one optional parameter. The first parameter
-               specifies the exact name (or a prefix) to request, the second
-               parameter specifies the link-layer address of the relay to use.
-               If the second parameter is omitted, the Interest will be
-               broadcasted. You may call it like this:
-               `ccnl_int /riot/peter/schmerzl b6:e5:94:26:ab:da`
-* `ccnl_cont` - generates and populates Content. The command expects one
-               mandatory and one optional parameter. The first parameter
-               specifies the name of the content to be created, the second
-               parameter specifies the content itself. The second parameter may
-               include spaces, e.g. you can call:
-               `ccnl_cont /riot/peter/schmerzl Hello World! Hello RIOT!`
+* `ccnl_int`  - generates and sends out an Interest. The command expects one
+                mandatory and one optional parameter. The first parameter
+                specifies the exact name (or a prefix) to request, the second
+                parameter specifies the link-layer address of the relay to use.
+                If the second parameter is omitted, the Interest will be
+                broadcasted. You may call it like this:
+                `ccnl_int /riot/peter/schmerzl b6:e5:94:26:ab:da`
+* `ccnl_cont` - generates and populates content. The command expects one
+                mandatory and one optional parameter. The first parameter
+                specifies the name of the content to be created, the second
+                parameter specifies the content itself. The second parameter
+                may include spaces, e.g. you can call:
+                `ccnl_cont /riot/peter/schmerzl Hello World! Hello RIOT!`
+* `ccnl_fib`  - modifies the FIB or shows its current state. If the command is
+                called without parameters, it will print the current state of
+                the FIB. It can also be called with the action parameters `add`
+                or `del` to add or delete an entry from the FIB, e.g.
+                `ccnl_fib add /riot/peter/schmerzl ab:cd:ef:01:23:45:67:89`
+                will add an entry for `/riot/peter/schmerzl` with
+                `ab:cd:ef:01:23:45:67:89` as a next hop and
+                `ccnl_fib del /riot/peter/schmerzl`
+                will remove the entry for `/riot/peter/schmerzl` and
+                `ccnl_fib del ab:cd:ef:01:23:45:67:89`
+                will remove all entries with `ab:cd:ef:01:23:45:67:89` as a
+                next hop.
 
 ## Example setup
 
@@ -39,11 +51,32 @@ An example usage of this application could be setup like this:
    windows.
 3. Call `make -B clean all term` in the first terminal and `PORT=tap1 make
    term` in the second one.
-4. Enter `open 3` in both terminals.
+4. Enter `ccnl_open 3` in both terminals.
 5. Enter `ccnl_cont /riot/peter/schmerzl Hello World! Hello RIOT!` on the first
    terminal.
-6. Enter `ccnl_int /riot/peter/schmerzl` in the second terminal.
-7. See the content being displayed. Be happy!
+6. Add a FIB entry for this prefix on the second node, e.g. using the broadcast
+   address: `ccnl_fib add /riot/peter/schmerzl ff:ff:ff:ff:ff:ff`
+7. Enter `ccnl_int /riot/peter/schmerzl` in the second terminal.
+8. See the content being displayed. Be happy!
+
+## Makefile configuration
+
+The ccn-lite package provides several configuration options through defines
+that can be set in the application Makefile. The following options are
+mandatory for now:
+* `CFLAGS += -DUSE_LINKLAYER`         - use CCN directly over the link layer
+* `CFLAGS += -DCCNL_UAPI_H_`          - tell ccn-lite to use the UAPI
+* `CFLAGS += -DUSE_SUITE_NDNTLV`      - use NDNTLV packet format
+* `CFLAGS += -DNEEDS_PREFIX_MATCHING` - enables prefix matching
+* `CFLAGS += -DNEEDS_PACKET_CRAFTING` - enable userspace packet creation
+Here's a list of some additional interesting options:
+* `CFLAGS += -DUSE_RONR`              - enable Reactive Optimistic Name-based
+                                        Routing (RONR)
+* `CFLAGS += -DUSE_STATS`             - enable statistics
+* `CFLAGS += -DUSE_DUP_CHECK`         - enable duplicate checks when forwarding
+* `CFLAGS += -DUSE_HMAC256`             - HMAC256 signed packets for CCNx1.0
+                                        encoding
+
 
 ## Wireshark dissector
 

pkg/ccn-lite/Makefile

@@ -1,6 +1,6 @@
 PKG_NAME=ccn-lite
-PKG_URL=https://github.com/OlegHahm/ccn-lite/
-PKG_VERSION=39b1406c11de9de364220909488eebabe7e81613
+PKG_URL=https://github.com/cn-uofbasel/ccn-lite/
+PKG_VERSION=9e48d328e162e97f091d913ada0bf50f58d1d3d7
 
 .PHONY: all
 

pkg/ccn-lite/ccn-lite-riot.h

@@ -19,11 +19,6 @@
  * @{
  */
 
-/**
- * Use RIOT specific configuration in CCN-Lite
- */
-#define CCNL_RIOT
-
 #include <unistd.h>
 #include "kernel_types.h"
 #include "arpa/inet.h"
@@ -105,6 +100,22 @@ extern "C" {
  * @}
  */
 
+/**
+ * @brief Some macro definitions
+ * @{
+ */
+#define free_2ptr_list(a,b)     ccnl_free(a), ccnl_free(b)
+#define free_3ptr_list(a,b,c)   ccnl_free(a), ccnl_free(b), ccnl_free(c)
+#define free_4ptr_list(a,b,c,d) ccnl_free(a), ccnl_free(b), ccnl_free(c), ccnl_free(d);
+#define free_5ptr_list(a,b,c,d,e) ccnl_free(a), ccnl_free(b), ccnl_free(c), ccnl_free(d), ccnl_free(e);
+
+/**
+ * Frees all memory directly and indirectly allocated for prefix information
+ */
+#define free_prefix(p)  do{ if(p) \
+                free_5ptr_list(p->bytes,p->comp,p->complen,p->chunknum,p); } while(0)
+
+
 /**
  * Constant string
  */
@@ -123,7 +134,7 @@ extern "C" {
 /**
  * Struct holding CCN-Lite's central relay information
  */
-extern struct ccnl_relay_s theRelay;
+extern struct ccnl_relay_s ccnl_relay;
 
 /**
  * @brief   Start the main CCN-Lite event-loop
@@ -149,26 +160,53 @@ int ccnl_open_netif(kernel_pid_t if_pid, gnrc_nettype_t netreg_type);
  *
  * @param[in] suite     CCN packet format
  * @param[in] name      The name that is requested
- * @param[in] addr      The relay's address to send to
- * @param[in] addr_len  Length of @p addr
  * @param[in] chunknum  Number of the requested content chunk
  * @param[out] buf      Buffer to write the content chunk to
  * @param[in] buf_len   Size of @p buf
  *
  * @return 0 on successfully sent Interest
  * @return -1 if Interested couldn't be sent
  */
-int ccnl_send_interest(int suite, char *name, uint8_t *addr, size_t addr_len,
-                        unsigned int *chunknum, unsigned char *buf,
-                        size_t buf_len);
+int ccnl_send_interest(int suite, char *name, unsigned int *chunknum,
+                       unsigned char *buf, size_t buf_len);
 
 /**
- * @brief Waits for incoming content chunk
+ * @brief Wait for incoming content chunk
+ *
+ * @pre The thread has to register for CCNL_CONT_CHUNK in @ref netreg first
+ *
+ * @post The thread should unregister from @ref netreg after this function returns
+ *
+ * @param[out] buf      Buffer to stores the received content
+ * @param[in]  buf_len  Size of @p buf
+ * @param[in]  timeout  Maximum to wait for the chunk, set to a default value if 0
  *
  * @return 0 if a content was received
  * @return -ETIMEDOUT if no chunk was received until timeout
  */
-int ccnl_wait_for_chunk(void *buf, size_t buf_len);
+int ccnl_wait_for_chunk(void *buf, size_t buf_len, uint64_t timeout);
+
+/**
+ * @brief Add entry to the CCN-Lite FIB
+ *
+ * @par[in] relay   Local relay struct
+ * @par[in] pfx     Prefix of the FIB entry
+ * @par[in] face    Face for the FIB entry
+ *
+ * @return 0    on success
+ * @return -1   on error
+ */
+int ccnl_fib_add_entry(struct ccnl_relay_s *relay, struct ccnl_prefix_s *pfx,
+                       struct ccnl_face_s *face);
+
+int ccnl_fib_rem_entry(struct ccnl_relay_s *relay, struct ccnl_prefix_s *pfx, struct ccnl_face_s *face);
+
+/**
+ * @brief Prints the current CCN-Lite FIB
+ *
+ * @par[in] relay   Local relay struct
+ */
+void ccnl_fib_show(struct ccnl_relay_s *relay);
 
 #ifdef __cplusplus
 }