diff options
| author | Felix Janda <felix.janda@posteo.de> | 2015-06-24 19:53:34 +0200 |
|---|---|---|
| committer | Eric Leblond <eric@regit.org> | 2015-06-26 09:12:55 +0200 |
| commit | c9337b31f756cae85299c8275b21088ce02885e2 (patch) | |
| tree | 21a2161706fd42a7ba3c330e9ec0485f40ecd42b /output | |
| parent | 8a6ddd1cb2b55c234f1a97f7e5d996f24f46b6f8 (diff) | |
Use stdint types everywhere
Signed-off-by: Felix Janda <felix.janda@posteo.de>
Diffstat (limited to 'output')
| -rw-r--r-- | output/mysql/ulogd_output_MYSQL.c | 2 | ||||
| -rw-r--r-- | output/ulogd_output_IPFIX.c | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/output/mysql/ulogd_output_MYSQL.c b/output/mysql/ulogd_output_MYSQL.c index 0a1ebfc..643320c 100644 --- a/output/mysql/ulogd_output_MYSQL.c +++ b/output/mysql/ulogd_output_MYSQL.c @@ -174,7 +174,7 @@ static int open_db_mysql(struct ulogd_pluginstance *upi) struct mysql_instance *mi = (struct mysql_instance *) upi->private; unsigned int connect_timeout = timeout_ce(upi->config_kset).u.value; char *server = host_ce(upi->config_kset).u.string; - u_int16_t port = port_ce(upi->config_kset).u.value; + uint16_t port = port_ce(upi->config_kset).u.value; char *user = user_ce(upi->config_kset).u.string; char *pass = pass_ce(upi->config_kset).u.string; char *db = db_ce(upi->config_kset).u.string; diff --git a/output/ulogd_output_IPFIX.c b/output/ulogd_output_IPFIX.c index 761d272..62f1d60 100644 --- a/output/ulogd_output_IPFIX.c +++ b/output/ulogd_output_IPFIX.c @@ -44,19 +44,19 @@ #endif #ifdef IPPROTO_SCTP -typedef u_int32_t sctp_assoc_t; +typedef uint32_t sctp_assoc_t; /* glibc doesn't yet have this, as defined by * draft-ietf-tsvwg-sctpsocket-11.txt */ struct sctp_sndrcvinfo { - u_int16_t sinfo_stream; - u_int16_t sinfo_ssn; - u_int16_t sinfo_flags; - u_int32_t sinfo_ppid; - u_int32_t sinfo_context; - u_int32_t sinfo_timetolive; - u_int32_t sinfo_tsn; - u_int32_t sinfo_cumtsn; + uint16_t sinfo_stream; + uint16_t sinfo_ssn; + uint16_t sinfo_flags; + uint32_t sinfo_ppid; + uint32_t sinfo_context; + uint32_t sinfo_timetolive; + uint32_t sinfo_tsn; + uint32_t sinfo_cumtsn; sctp_assoc_t sinfo_assoc_id; }; #endif @@ -207,7 +207,7 @@ struct ipfix_instance { }; #define ULOGD_IPFIX_TEMPL_BASE 1024 -static u_int16_t next_template_id = ULOGD_IPFIX_TEMPL_BASE; +static uint16_t next_template_id = ULOGD_IPFIX_TEMPL_BASE; /* Build the IPFIX template from the input keys */ struct ulogd_ipfix_template * |