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: provide helpful FILLZERO macro (for certain memset calls)
[secnet.git]
/
secnet.h
diff --git
a/secnet.h
b/secnet.h
index 2439f148bdc39944beb15f2ddc15de75927fcbdd..49afd322e83130506da37f96e3036e7ea57efed0 100644
(file)
--- a/
secnet.h
+++ b/
secnet.h
@@
-161,15
+161,12
@@
static const struct timeval *const tv_now = &tv_now_global;
/***** SCHEDULING support */
/***** SCHEDULING support */
-/* "now" is current program time, in milliseconds. It is derived
- (once) from tv_now. If nfds_io is insufficient for your needs, set
- it to the required number and return ERANGE. timeout is in milliseconds;
- if it is too high then lower it. It starts at -1 (==infinite) */
+/* If nfds_io is insufficient for your needs, set it to the required
+ number and return ERANGE. timeout is in milliseconds; if it is too
+ high then lower it. It starts at -1 (==infinite) */
typedef int beforepoll_fn(void *st, struct pollfd *fds, int *nfds_io,
typedef int beforepoll_fn(void *st, struct pollfd *fds, int *nfds_io,
- int *timeout_io, const struct timeval *tv_now,
- uint64_t *now);
-typedef void afterpoll_fn(void *st, struct pollfd *fds, int nfds,
- const struct timeval *tv_now, uint64_t *now);
+ int *timeout_io);
+typedef void afterpoll_fn(void *st, struct pollfd *fds, int nfds);
/* Register interest in the main loop of the program. Before a call
to poll() your supplied beforepoll function will be called. After
/* Register interest in the main loop of the program. Before a call
to poll() your supplied beforepoll function will be called. After
@@
-441,7
+438,7
@@
struct dh_if {
/* HASH interface */
typedef void *hash_init_fn(void);
/* HASH interface */
typedef void *hash_init_fn(void);
-typedef void hash_update_fn(void *st,
uint8_t const
*buf, int32_t len);
+typedef void hash_update_fn(void *st,
const void
*buf, int32_t len);
typedef void hash_final_fn(void *st, uint8_t *digest);
struct hash_if {
int32_t len; /* Hash output length in bytes */
typedef void hash_final_fn(void *st, uint8_t *digest);
struct hash_if {
int32_t len; /* Hash output length in bytes */
@@
-498,4
+495,9
@@
extern void log_from_fd(int fd, cstring_t prefix, struct log_if *log);
/***** END of log functions *****/
/***** END of log functions *****/
+#define STRING2(x) #x
+#define STRING(x) STRING2(x)
+
+#define FILLZERO(obj) (memset(&(obj),0,sizeof((obj))))
+
#endif /* secnet_h */
#endif /* secnet_h */