1 files changed, 15 insertions, 12 deletions

diff --git a/src/ipcpd/unicast/fa.c b/src/ipcpd/unicast/fa.c
index c157d71c..c0447885 100644
--- a/src/ipcpd/unicast/fa.c
+++ b/src/ipcpd/unicast/fa.c
@@ -81,7 +81,7 @@ struct fa_msg {
         uint16_t ece;
         uint8_t  code;
         uint8_t  availability;
-        uint8_t  in_order;
+        uint8_t  service;
 } __attribute__((packed));
 
 struct cmd {
@@ -111,7 +111,7 @@ struct fa_flow {
 
 struct {
         pthread_rwlock_t flows_lock;
-        struct fa_flow   flows[PROG_MAX_FLOWS];
+        struct fa_flow   flows[PROC_MAX_FLOWS];
 #ifdef IPCP_FLOW_STATS
         size_t           n_flows;
 #endif
@@ -145,7 +145,7 @@ static int fa_rib_read(const char * path,
 
         fd = atoi(entry);
 
-        if (fd < 0 || fd >= PROG_MAX_FLOWS)
+        if (fd < 0 || fd >= PROC_MAX_FLOWS)
                 return -1;
 
         if (len < 1536)
@@ -225,7 +225,7 @@ static int fa_rib_readdir(char *** buf)
         if (*buf == NULL)
                 goto fail_entries;
 
-        for (i = 0; i < PROG_MAX_FLOWS; ++i) {
+        for (i = 0; i < PROC_MAX_FLOWS; ++i) {
                 struct fa_flow * flow;
 
                 flow = &fa.flows[i];
@@ -306,7 +306,7 @@ static int eid_to_fd(uint64_t eid)
 
         fd = eid & 0xFFFFFFFF;
 
-        if (fd < 0 || fd >= PROG_MAX_FLOWS)
+        if (fd < 0 || fd >= PROC_MAX_FLOWS)
                 return -1;
 
         flow = &fa.flows[fd];
@@ -496,11 +496,12 @@ static int fa_handle_flow_req(struct fa_msg * msg,
         qs.availability = msg->availability;
         qs.loss         = ntoh32(msg->loss);
         qs.ber          = ntoh32(msg->ber);
-        qs.in_order     = msg->in_order;
+        qs.service      = msg->service;
         qs.max_gap      = ntoh32(msg->max_gap);
         qs.timeout      = ntoh32(msg->timeout);
 
-        fd = ipcp_wait_flow_req_arr(dst, qs, IPCP_UNICAST_MPL, &data);
+        fd = ipcp_wait_flow_req_arr(dst, qs, IPCP_UNICAST_MPL,
+                                    IPCP_UNICAST_MTU, &data);
         if (fd < 0)
                 return fd;
 
@@ -528,7 +529,8 @@ static int fa_handle_flow_reply(struct fa_msg * msg,
         time_t           mpl = IPCP_UNICAST_MPL;
         int              response;
 
-        assert(len >= sizeof(*msg));
+        if (len < sizeof(*msg))
+                return -EINVAL;
 
         data.data = (uint8_t *) msg + sizeof(*msg);
         data.len  = len - sizeof(*msg);
@@ -558,7 +560,8 @@ static int fa_handle_flow_reply(struct fa_msg * msg,
 
         pthread_rwlock_unlock(&fa.flows_lock);
 
-        if (ipcp_flow_alloc_reply(fd, response, mpl, &data) < 0) {
+        if (ipcp_flow_alloc_reply(fd, response, mpl,
+                                  IPCP_UNICAST_MTU, &data) < 0) {
                 log_err("Failed to reply for flow allocation on fd %d.", fd);
                 return -EIRMD;
         }
@@ -572,8 +575,8 @@ static int fa_handle_flow_update(struct fa_msg * msg,
         struct fa_flow * flow;
         int              fd;
 
-        (void) len;
-        assert(len >= sizeof(*msg));
+        if (len < sizeof(*msg))
+                return -EINVAL;
 
         pthread_rwlock_wrlock(&fa.flows_lock);
 
@@ -789,7 +792,7 @@ int fa_alloc(int              fd,
         msg->availability = qs.availability;
         msg->loss         = hton32(qs.loss);
         msg->ber          = hton32(qs.ber);
-        msg->in_order     = qs.in_order;
+        msg->service      = qs.service;
         msg->max_gap      = hton32(qs.max_gap);
         msg->timeout      = hton32(qs.timeout);