diff options
| author | dimitri staessens <dimitri.staessens@intec.ugent.be> | 2016-05-08 16:54:12 +0200 |
|---|---|---|
| committer | dimitri staessens <dimitri.staessens@intec.ugent.be> | 2016-05-08 16:54:12 +0200 |
| commit | 4e13c71204e9667cfc4b7da6491972f854d9402d (patch) | |
| tree | 924156d142bce5521757e9349fa0b3fd2ff1b0cc /src/lib | |
| parent | 021af9e01ce6c6376534b33ef1a06ea4189028d4 (diff) | |
| download | ouroboros-4e13c71204e9667cfc4b7da6491972f854d9402d.tar.gz ouroboros-4e13c71204e9667cfc4b7da6491972f854d9402d.zip | |
lib: changed port_id to int
returning -1 as uint32_t leads to bugs.
also changed types in GPB to sint to use zigzag encoding.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/dev.c | 4 | ||||
| -rw-r--r-- | src/lib/ipcp.c | 20 | ||||
| -rw-r--r-- | src/lib/ipcpd_messages.proto | 10 | ||||
| -rw-r--r-- | src/lib/irmd_messages.proto | 7 |
4 files changed, 20 insertions, 21 deletions
diff --git a/src/lib/dev.c b/src/lib/dev.c index c99e8cdb..d574363b 100644 --- a/src/lib/dev.c +++ b/src/lib/dev.c @@ -46,7 +46,7 @@ struct flow { struct shm_ap_rbuff * rb; - uint32_t port_id; + int port_id; uint32_t oflags; /* don't think this needs locking */ @@ -131,7 +131,7 @@ void ap_fini() } #if 0 -static int port_id_to_fd(uint32_t port_id) +static int port_id_to_fd(int port_id) { int i; for (i = 0; i < AP_MAX_FLOWS; ++i) diff --git a/src/lib/ipcp.c b/src/lib/ipcp.c index 75676915..843582b9 100644 --- a/src/lib/ipcp.c +++ b/src/lib/ipcp.c @@ -364,7 +364,7 @@ int ipcp_name_unreg(pid_t pid, } int ipcp_flow_alloc(pid_t pid, - uint32_t port_id, + int port_id, pid_t n_pid, char * dst_name, char * src_ap_name, @@ -402,10 +402,10 @@ int ipcp_flow_alloc(pid_t pid, return ret; } -int ipcp_flow_alloc_resp(pid_t pid, - uint32_t port_id, - pid_t n_pid, - int response) +int ipcp_flow_alloc_resp(pid_t pid, + int port_id, + pid_t n_pid, + int response) { ipcp_msg_t msg = IPCP_MSG__INIT; ipcp_msg_t * recv_msg = NULL; @@ -468,9 +468,9 @@ int ipcp_flow_req_arr(pid_t pid, return port_id; } -int ipcp_flow_alloc_reply(pid_t pid, - uint32_t port_id, - int response) +int ipcp_flow_alloc_reply(pid_t pid, + int port_id, + int response) { irm_msg_t msg = IRM_MSG__INIT; irm_msg_t * recv_msg = NULL; @@ -498,8 +498,8 @@ int ipcp_flow_alloc_reply(pid_t pid, } -int ipcp_flow_dealloc(pid_t pid, - uint32_t port_id) +int ipcp_flow_dealloc(pid_t pid, + int port_id) { if (pid != 0) { ipcp_msg_t msg = IPCP_MSG__INIT; diff --git a/src/lib/ipcpd_messages.proto b/src/lib/ipcpd_messages.proto index daca011d..901adaa0 100644 --- a/src/lib/ipcpd_messages.proto +++ b/src/lib/ipcpd_messages.proto @@ -20,13 +20,13 @@ message ipcp_msg { repeated string dif_names = 4; optional int32 len = 5; optional string name = 6; - optional int32 port_id = 7; + optional sint32 port_id = 7; optional string dst_name = 8; optional string src_ap_name = 9; optional string src_ae_name = 10; optional dif_config_msg conf = 11; - optional int32 fd = 12; - optional int32 pid = 13; - optional int32 response = 14; - optional int32 result = 15; + optional sint32 fd = 12; + optional sint32 pid = 13; + optional sint32 response = 14; + optional sint32 result = 15; }; diff --git a/src/lib/irmd_messages.proto b/src/lib/irmd_messages.proto index c336614e..27194ccb 100644 --- a/src/lib/irmd_messages.proto +++ b/src/lib/irmd_messages.proto @@ -49,11 +49,10 @@ message irm_msg { optional uint32 api_id = 3; optional uint32 ipcp_type = 5; repeated string dif_name = 6; - optional int32 response = 7; + optional sint32 response = 7; optional string dst_name = 8; - optional uint32 port_id = 9; + optional sint32 port_id = 9; optional int32 pid = 10; optional dif_config_msg conf = 11; - optional int32 cfd = 12; - optional int32 result = 13; + optional sint32 result = 12; }; |