diff options
Diffstat (limited to 'src/ipcpd/normal')
-rw-r--r-- | src/ipcpd/normal/dt.c | 6 | ||||
-rw-r--r-- | src/ipcpd/normal/fa.c | 6 | ||||
-rw-r--r-- | src/ipcpd/normal/pol/graph.c | 10 | ||||
-rw-r--r-- | src/ipcpd/normal/pol/link_state.c | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/src/ipcpd/normal/dt.c b/src/ipcpd/normal/dt.c index f99f7072..5692a699 100644 --- a/src/ipcpd/normal/dt.c +++ b/src/ipcpd/normal/dt.c @@ -61,7 +61,7 @@ struct { struct routing_i * routing[QOS_CUBE_MAX]; struct bmp * res_fds; - struct ae_info aes[AP_RES_FDS]; + struct ae_info aes[PROG_RES_FDS]; pthread_rwlock_t lock; pthread_t listener; @@ -127,7 +127,7 @@ static void sdu_handler(int fd, } else { dt_pci_shrink(sdb); - if (dt_pci.fd > AP_RES_FDS) { + if (dt_pci.fd > PROG_RES_FDS) { if (ipcp_flow_write(dt_pci.fd, sdb)) ipcp_sdb_release(sdb); return; @@ -225,7 +225,7 @@ int dt_init(enum pol_routing pr, goto fail_rwlock_init; } - dt.res_fds = bmp_create(AP_RES_FDS, 0); + dt.res_fds = bmp_create(PROG_RES_FDS, 0); if (dt.res_fds == NULL) goto fail_res_fds; diff --git a/src/ipcpd/normal/fa.c b/src/ipcpd/normal/fa.c index e684abd2..6b8c65aa 100644 --- a/src/ipcpd/normal/fa.c +++ b/src/ipcpd/normal/fa.c @@ -50,8 +50,8 @@ typedef FlowAllocMsg flow_alloc_msg_t; struct { pthread_rwlock_t flows_lock; - int r_fd[AP_MAX_FLOWS]; - uint64_t r_addr[AP_MAX_FLOWS]; + int r_fd[PROG_MAX_FLOWS]; + uint64_t r_addr[PROG_MAX_FLOWS]; int fd; struct sdu_sched * sdu_sched; @@ -188,7 +188,7 @@ int fa_init(void) { int i; - for (i = 0; i < AP_MAX_FLOWS; ++i) + for (i = 0; i < PROG_MAX_FLOWS; ++i) destroy_conn(i); if (pthread_rwlock_init(&fa.flows_lock, NULL)) diff --git a/src/ipcpd/normal/pol/graph.c b/src/ipcpd/normal/pol/graph.c index a0af19f9..c3b5f976 100644 --- a/src/ipcpd/normal/pol/graph.c +++ b/src/ipcpd/normal/pol/graph.c @@ -359,7 +359,7 @@ static int get_min_vertex(struct graph * graph, *v = NULL; list_for_each(p, &graph->vertices) { - if (used[i] == true) { + if (used[i]) { i++; continue; } @@ -592,9 +592,9 @@ int graph_routing_table_lfa(struct graph * graph, struct list_head * table) { int * s_dist; - int * n_dist[AP_MAX_FLOWS]; - uint64_t addrs[AP_MAX_FLOWS]; - int n_index[AP_MAX_FLOWS]; + int * n_dist[PROG_MAX_FLOWS]; + uint64_t addrs[PROG_MAX_FLOWS]; + int n_index[PROG_MAX_FLOWS]; struct list_head * p; struct list_head * q; struct vertex * v; @@ -609,7 +609,7 @@ int graph_routing_table_lfa(struct graph * graph, pthread_mutex_lock(&graph->lock); - for (j = 0; j < AP_MAX_FLOWS; j++) { + for (j = 0; j < PROG_MAX_FLOWS; j++) { n_dist[i] = NULL; n_index[i] = -1; addrs[i] = -1; diff --git a/src/ipcpd/normal/pol/link_state.c b/src/ipcpd/normal/pol/link_state.c index 3979328c..00c72069 100644 --- a/src/ipcpd/normal/pol/link_state.c +++ b/src/ipcpd/normal/pol/link_state.c @@ -416,7 +416,7 @@ static void * calculate_pff(void * o) struct list_head table; struct list_head * p; struct list_head * q; - int fds[AP_MAX_FLOWS]; + int fds[PROG_MAX_FLOWS]; instance = (struct routing_i *) o; |