chiark
/
gitweb
/
~ian
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cleanup: remove unused "line" member in struct transform
[secnet.git]
/
secnet.c
diff --git
a/secnet.c
b/secnet.c
index efe52b356048bc2e44ca0ac93939bd6edae90bf0..7869182b51ec5a653ea967f4154d746bd163ad88 100644
(file)
--- a/
secnet.c
+++ b/
secnet.c
@@
-1,7
+1,7
@@
-extern char version[];
-
#include "secnet.h"
#include <stdio.h>
#include "secnet.h"
#include <stdio.h>
+#include <assert.h>
+#include <limits.h>
#include <string.h>
#include <getopt.h>
#include <errno.h>
#include <string.h>
#include <getopt.h>
#include <errno.h>
@@
-27,26
+27,18
@@
cstring_t require_root_privileges_explanation=NULL;
static pid_t secnet_pid;
static pid_t secnet_pid;
-/* from log.c */
-extern uint32_t message_level;
-extern bool_t secnet_is_daemon;
-extern struct log_if *system_log;
-
-/* from process.c */
-extern void start_signal_handling(void);
-
/* Structures dealing with poll() call */
struct poll_interest {
beforepoll_fn *before;
afterpoll_fn *after;
void *state;
/* Structures dealing with poll() call */
struct poll_interest {
beforepoll_fn *before;
afterpoll_fn *after;
void *state;
-
u
int32_t max_nfds;
-
u
int32_t nfds;
+ int32_t max_nfds;
+ int32_t nfds;
cstring_t desc;
struct poll_interest *next;
};
static struct poll_interest *reg=NULL;
cstring_t desc;
struct poll_interest *next;
};
static struct poll_interest *reg=NULL;
-static
u
int32_t total_nfds=10;
+static int32_t total_nfds=10;
static bool_t finished=False;
static bool_t finished=False;
@@
-229,7
+221,7
@@
static void setup(dict_t *config)
}
void register_for_poll(void *st, beforepoll_fn *before,
}
void register_for_poll(void *st, beforepoll_fn *before,
- afterpoll_fn *after,
u
int32_t max_nfds, cstring_t desc)
+ afterpoll_fn *after, int32_t max_nfds, cstring_t desc)
{
struct poll_interest *i;
{
struct poll_interest *i;
@@
-240,6
+232,7
@@
void register_for_poll(void *st, beforepoll_fn *before,
i->max_nfds=max_nfds;
i->nfds=0;
i->desc=desc;
i->max_nfds=max_nfds;
i->nfds=0;
i->desc=desc;
+ assert(total_nfds < INT_MAX - max_nfds);
total_nfds+=max_nfds;
i->next=reg;
reg=i;
total_nfds+=max_nfds;
i->next=reg;
reg=i;