diff options
| author | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2017-02-07 10:35:49 +0000 |
|---|---|---|
| committer | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2017-02-07 10:35:49 +0000 |
| commit | 1bf2dd6aef3af6c81794c0551278373e44310b5c (patch) | |
| tree | 2c5bb331021e0b15eb43827d05cd06082b6c8edb /src/lib | |
| parent | 129d5e06d627346cb30ce60cdf43f8a1ae023dcb (diff) | |
| parent | d64f05e8bf1277132b648bda2e1175ad8c1d2d5c (diff) | |
| download | ouroboros-1bf2dd6aef3af6c81794c0551278373e44310b5c.tar.gz ouroboros-1bf2dd6aef3af6c81794c0551278373e44310b5c.zip | |
Merged in dstaesse/ouroboros/be-wip (pull request #362)
ipcpd, lib: Revise normal IPCP
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/dif_config.proto | 16 | ||||
| -rw-r--r-- | src/lib/irm.c | 4 | ||||
| -rw-r--r-- | src/lib/shm_rdrbuff.c | 20 |
3 files changed, 16 insertions, 24 deletions
diff --git a/src/lib/dif_config.proto b/src/lib/dif_config.proto index f1f8747b..d47af049 100644 --- a/src/lib/dif_config.proto +++ b/src/lib/dif_config.proto @@ -30,14 +30,14 @@ message dif_config_msg { optional uint32 addr_size = 3; optional uint32 cep_id_size = 4; optional uint32 pdu_length_size = 5; - optional uint32 qos_id_size = 6; - optional uint32 seqno_size = 7; - optional bool has_ttl = 8; - optional bool has_chk = 9; - optional uint32 min_pdu_size = 10; - optional uint32 max_pdu_size = 11; - optional uint32 addr_auth_type = 12; - optional uint32 dt_gam_type = 13; + optional uint32 seqno_size = 6; + optional bool has_ttl = 7; + optional bool has_chk = 8; + optional uint32 min_pdu_size = 9; + optional uint32 max_pdu_size = 10; + optional uint32 addr_auth_type = 11; + optional uint32 dt_gam_type = 12; + optional uint32 rm_gam_type = 13; // Config for shim UDP optional uint32 ip_addr = 14; optional uint32 dns_addr = 15; diff --git a/src/lib/irm.c b/src/lib/irm.c index ade38b6f..8b312833 100644 --- a/src/lib/irm.c +++ b/src/lib/irm.c @@ -113,7 +113,6 @@ int irm_bootstrap_ipcp(pid_t api, config.has_addr_size = true; config.has_cep_id_size = true; config.has_pdu_length_size = true; - config.has_qos_id_size = true; config.has_seqno_size = true; config.has_has_ttl = true; config.has_has_chk = true; @@ -121,11 +120,11 @@ int irm_bootstrap_ipcp(pid_t api, config.has_max_pdu_size = true; config.has_addr_auth_type = true; config.has_dt_gam_type = true; + config.has_rm_gam_type = true; config.addr_size = conf->addr_size; config.cep_id_size = conf->cep_id_size; config.pdu_length_size = conf->pdu_length_size; - config.qos_id_size = conf->qos_id_size; config.seqno_size = conf->seqno_size; config.has_ttl = conf->has_ttl; config.has_chk = conf->has_chk; @@ -133,6 +132,7 @@ int irm_bootstrap_ipcp(pid_t api, config.max_pdu_size = conf->max_pdu_size; config.addr_auth_type = conf->addr_auth_type; config.dt_gam_type = conf->dt_gam_type; + config.rm_gam_type = conf->rm_gam_type; break; case IPCP_SHIM_UDP: config.has_ip_addr = true; diff --git a/src/lib/shm_rdrbuff.c b/src/lib/shm_rdrbuff.c index ce81d171..55047aa5 100644 --- a/src/lib/shm_rdrbuff.c +++ b/src/lib/shm_rdrbuff.c @@ -619,28 +619,20 @@ uint8_t * shm_du_buff_tail_alloc(struct shm_du_buff * sdb, return buf; } -int shm_du_buff_head_release(struct shm_du_buff * sdb, - size_t size) +void shm_du_buff_head_release(struct shm_du_buff * sdb, + size_t size) { assert(sdb); - - if (size > sdb->du_tail - sdb->du_head) - return -EOVERFLOW; + assert(!(size > sdb->du_tail - sdb->du_head)); sdb->du_head += size; - - return 0; } -int shm_du_buff_tail_release(struct shm_du_buff * sdb, - size_t size) +void shm_du_buff_tail_release(struct shm_du_buff * sdb, + size_t size) { assert(sdb); - - if (size > sdb->du_tail - sdb->du_head) - return -EOVERFLOW; + assert(!(size > sdb->du_tail - sdb->du_head)); sdb->du_tail -= size; - - return 0; } |