summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSander Vrijders <sander.vrijders@ugent.be>2017-09-21 14:58:07 +0000
committerdimitri staessens <dimitri.staessens@ugent.be>2017-09-21 14:58:07 +0000
commite2d3b18ab787ebe090cd958cc63be655be86f42c (patch)
treea51f0260c4445ddf35fb190e605704669e84bb94 /include
parente5336f1309c42da770ef7aa603b463ad4d24e2c9 (diff)
parentf6071ecf0cd3768eaed9a847f676433c120ea89e (diff)
downloadouroboros-e2d3b18ab787ebe090cd958cc63be655be86f42c.tar.gz
ouroboros-e2d3b18ab787ebe090cd958cc63be655be86f42c.zip
Merged in sandervrijders/ouroboros/be-lfa-pff (pull request #607)
ipcpd: normal: Add alternate hop PFF
Diffstat (limited to 'include')
-rw-r--r--include/ouroboros/hashtable.h9
-rw-r--r--include/ouroboros/ipcp.h7
2 files changed, 10 insertions, 6 deletions
diff --git a/include/ouroboros/hashtable.h b/include/ouroboros/hashtable.h
index 35fa202f..b5777e2f 100644
--- a/include/ouroboros/hashtable.h
+++ b/include/ouroboros/hashtable.h
@@ -40,11 +40,14 @@ void htable_flush(struct htable * table);
/* Passes ownership of the block of memory */
int htable_insert(struct htable * table,
uint64_t key,
- void * val);
+ void * val,
+ size_t len);
/* The block of memory returned is no copy */
-void * htable_lookup(struct htable * table,
- uint64_t key);
+int htable_lookup(struct htable * table,
+ uint64_t key,
+ void ** val,
+ size_t * len);
int htable_delete(struct htable * table,
uint64_t key);
diff --git a/include/ouroboros/ipcp.h b/include/ouroboros/ipcp.h
index de435e08..1b578fa2 100644
--- a/include/ouroboros/ipcp.h
+++ b/include/ouroboros/ipcp.h
@@ -42,15 +42,16 @@ enum ipcp_type {
/* Normal IPCP policies */
enum pol_addr_auth {
- FLAT_RANDOM = 0
+ ADDR_AUTH_FLAT_RANDOM = 0
};
enum pol_routing {
- LINK_STATE = 0
+ ROUTING_LINK_STATE = 0
};
enum pol_pff {
- SIMPLE_PFF = 0
+ PFF_SIMPLE = 0,
+ PFF_ALTERNATE
};
enum pol_dir_hash {