path: root/src/multichannel.c
diff options
authorPablo Neira Ayuso <>2012-04-24 10:55:33 +0200
committerPablo Neira Ayuso <>2012-08-01 19:17:35 +0200
commitc712ccebc993cad3f73000bbe9e4788ebeb95ca2 (patch)
treeea989f68f8b5ae703948be15c76457d17d5a963d /src/multichannel.c
parentec4c0ff33746fb2c663194f27dd41deee83f870f (diff)
conntrackd: generalize file descriptor infrastructure
This patch generalizes the select-based file descriptor infrastructure by allowing you to register file descriptors and its callbacks. Instead of hardcoding the descriptors that needs to be checked. Now, struct fds_item contains a callback and pointer to data that is passed to it: struct fds_item { struct list_head head; int fd; + void (*cb)(void *data); + void *data; }; Then, we check which ones are active in the select_main_step() function: list_for_each_entry(cur, &STATE(fds)->list, head) { if (FD_ISSET(cur->fd, &readfds)) cur->cb(cur->data); } And it invoked the corresponding callback. I had to slightly modify the channel infrastructure to fit it into the changes. This modularity is required for the upcoming cthelper support. Signed-off-by: Pablo Neira Ayuso <>
Diffstat (limited to 'src/multichannel.c')
1 files changed, 4 insertions, 3 deletions
diff --git a/src/multichannel.c b/src/multichannel.c
index de69d5c..952b567 100644
--- a/src/multichannel.c
+++ b/src/multichannel.c
@@ -109,8 +109,9 @@ void multichannel_set_current_channel(struct multichannel *m, int i)
m->current = m->channel[i];
-void multichannel_change_current_channel(struct multichannel *m, int i)
+multichannel_change_current_channel(struct multichannel *m, struct channel *c)
- if (m->current != m->channel[i])
- m->current = m->channel[i];
+ if (m->current != c)
+ m->current = c;