ipcpd: normal: Improve upon the internal design

This commit will remove the RMT component from the normal IPCP, as
some of its functionality would else be duplicated in the FMGR. Now
all reading from flows, either N-1 or N+1 is done in the FMGR, then
either passed to the FRCT or a lookup is performed in the PFF (not
there yet) and the PDU is forwarded.

1 files changed, 20 insertions, 23 deletions

diff --git a/src/ipcpd/normal/fmgr.h b/src/ipcpd/normal/fmgr.h
index 0f2cd045..f97cf858 100644
--- a/src/ipcpd/normal/fmgr.h
+++ b/src/ipcpd/normal/fmgr.h
@@ -37,29 +37,26 @@
 int fmgr_init();
 int fmgr_fini();
 
-/* N-flow ops */
-int fmgr_mgmt_flow(char * dst_name);
-
-int fmgr_dt_flow(char * dst_name,
-                 enum qos_cube qos);
-
-/* N+1-flow ops, local */
-int fmgr_flow_alloc(int           fd,
-                    char *        dst_ap_name,
-                    char *        src_ae_name,
-                    enum qos_cube qos);
-
-int fmgr_flow_alloc_resp(int fd,
-                         int response);
-
-int fmgr_flow_dealloc(int fd);
-
-/* N+1-flow ops, remote */
-int fmgr_frct_post_buf(cep_id_t   id,
-                       buffer_t * buf);
-
-/* SDU for N+1-flow */
-int fmgr_frct_post_sdu(cep_id_t             id,
+int fmgr_np1_alloc(int           fd,
+                   char *        dst_ap_name,
+                   char *        src_ae_name,
+                   enum qos_cube qos);
+int fmgr_np1_alloc_resp(int fd,
+                        int response);
+int fmgr_np1_dealloc(int fd);
+
+int fmgr_np1_post_buf(cep_id_t   id,
+                      buffer_t * buf);
+int fmgr_np1_post_sdu(cep_id_t             id,
+                      struct shm_du_buff * sdb);
+
+int fmgr_nm1_mgmt_flow(char * dst_name);
+int fmgr_nm1_dt_flow(char * dst_name,
+                     enum qos_cube qos);
+
+int fmgr_nm1_write_sdu(struct pci *         pci,
                        struct shm_du_buff * sdb);
+int fmgr_nm1_write_buf(struct pci * pci,
+                       buffer_t *   buf);
 
 #endif