| Message ID | 20171111161836.23356-3-a@unstable.cc |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [Openvpn-devel,v5,1/3] pf: restyle pf_c2c/addr_test() to make them 'struct context' agnostic | expand |
Hi, On 11-11-17 17:18, Antonio Quartulli wrote: > From: Antonio Quartulli <antonio@openvpn.net> > > Function prototypes should be included when compiling their > definitions so that it is clear to compilers and static > analyzers that they are not static. > > This means that several declarations have to be moved to the > related header files which in turn have to be included by the > source files implementing them. > > Generally speaking this also improves the coding style and > makes this code more consistent with the rest that already > follows this rule. > > Cc: Steffan Karger <steffan@karger.me> > Signed-off-by: Antonio Quartulli <antonio@openvpn.net> > --- > > v4: rebased and erroneous conflict markers removed > v5: no change > > src/openvpn/crypto.h | 8 ++++++++ > src/openvpn/error.c | 8 +------- > src/openvpn/forward.h | 35 +++++++++++++++++++++++++++++++++++ > src/openvpn/fragment.c | 1 + > src/openvpn/gremlin.c | 1 + > src/openvpn/init.h | 2 ++ > src/openvpn/lladdr.c | 1 + > src/openvpn/manage.h | 10 +++++----- > src/openvpn/mbuf.h | 4 ++-- > src/openvpn/misc.h | 8 -------- > src/openvpn/mroute.h | 20 ++++++++++---------- > src/openvpn/multi.h | 7 +++---- > src/openvpn/occ.h | 16 ++++++++++------ > src/openvpn/pf.h | 7 +++++++ > src/openvpn/ping.h | 4 ++++ > src/openvpn/plugin.h | 2 ++ > src/openvpn/socket.h | 13 +++++++------ > 17 files changed, 99 insertions(+), 48 deletions(-) > > diff --git a/src/openvpn/crypto.h b/src/openvpn/crypto.h > index 6d60ef8c..c489ef1e 100644 > --- a/src/openvpn/crypto.h > +++ b/src/openvpn/crypto.h > @@ -459,6 +459,9 @@ void prng_bytes(uint8_t *output, int len); > > void prng_uninit(void); > > +/* an analogue to the random() function, but use prng_bytes */ > +long int get_random(void); > + > void test_crypto(struct crypto_options *co, struct frame *f); > > > @@ -514,5 +517,10 @@ key_ctx_bi_defined(const struct key_ctx_bi *key) > } > > > +#else > + > +/* use plain random is no crypto support is compiled */ > +#define get_random random > + > #endif /* ENABLE_CRYPTO */ > #endif /* CRYPTO_H */ > diff --git a/src/openvpn/error.c b/src/openvpn/error.c > index 26455455..33806e44 100644 > --- a/src/openvpn/error.c > +++ b/src/openvpn/error.c > @@ -31,6 +31,7 @@ > > #include "error.h" > #include "buffer.h" > +#include "init.h" > #include "misc.h" > #include "win32.h" > #include "socket.h" > @@ -734,13 +735,6 @@ openvpn_exit(const int status) > { > if (!forked) > { > - void tun_abort(); > - > -#ifdef ENABLE_PLUGIN > - void plugin_abort(void); > - > -#endif > - > tun_abort(); > > #ifdef _WIN32 > diff --git a/src/openvpn/forward.h b/src/openvpn/forward.h > index 0b7f1250..248c941e 100644 > --- a/src/openvpn/forward.h > +++ b/src/openvpn/forward.h > @@ -63,6 +63,41 @@ > > #define IOW_READ (IOW_READ_TUN|IOW_READ_LINK) > > +extern counter_type link_read_bytes_global; > + > +extern counter_type link_write_bytes_global; > + > +#ifdef ENABLE_CRYPTO > +void check_tls_dowork(struct context *c); > + > +void check_tls_errors_co(struct context *c); > + > +void check_tls_errors_nco(struct context *c); > +#endif /* ENABLE_CRYPTO */ > + > +#if P2MP > +void check_incoming_control_channel_dowork(struct context *c); > + > +void check_scheduled_exit_dowork(struct context *c); > + > +void check_push_request_dowork(struct context *c); > +#endif /* P2MP */ > + > +#ifdef ENABLE_FRAGMENT > +void check_fragment_dowork(struct context *c); > +#endif /* ENABLE_FRAGMENT */ > + > +void check_connection_established_dowork(struct context *c); > + > +void check_add_routes_dowork(struct context *c); > + > +void check_inactivity_timeout_dowork(struct context *c); > + > +void check_server_poll_timeout_dowork(struct context *c); > + > +void check_status_file_dowork(struct context *c); > + > +void io_wait_dowork(struct context *c, const unsigned int flags); > > void pre_select(struct context *c); > > diff --git a/src/openvpn/fragment.c b/src/openvpn/fragment.c > index 84f01214..36588060 100644 > --- a/src/openvpn/fragment.c > +++ b/src/openvpn/fragment.c > @@ -31,6 +31,7 @@ > > #ifdef ENABLE_FRAGMENT > > +#include "crypto.h" > #include "misc.h" > #include "fragment.h" > #include "integer.h" > diff --git a/src/openvpn/gremlin.c b/src/openvpn/gremlin.c > index e85ce9cf..dca506a9 100644 > --- a/src/openvpn/gremlin.c > +++ b/src/openvpn/gremlin.c > @@ -38,6 +38,7 @@ > > #include "error.h" > #include "common.h" > +#include "crypto.h" > #include "misc.h" > #include "otime.h" > #include "gremlin.h" > diff --git a/src/openvpn/init.h b/src/openvpn/init.h > index 15feb677..b681cd9d 100644 > --- a/src/openvpn/init.h > +++ b/src/openvpn/init.h > @@ -140,4 +140,6 @@ void open_plugins(struct context *c, const bool import_options, int init_point); > > #endif > > +void tun_abort(void); > + > #endif /* ifndef INIT_H */ > diff --git a/src/openvpn/lladdr.c b/src/openvpn/lladdr.c > index ff71e48c..ea35e4d9 100644 > --- a/src/openvpn/lladdr.c > +++ b/src/openvpn/lladdr.c > @@ -11,6 +11,7 @@ > #include "syshead.h" > #include "error.h" > #include "misc.h" > +#include "lladdr.h" > > int > set_lladdr(const char *ifname, const char *lladdr, > diff --git a/src/openvpn/manage.h b/src/openvpn/manage.h > index 676be640..23339ee7 100644 > --- a/src/openvpn/manage.h > +++ b/src/openvpn/manage.h > @@ -583,17 +583,17 @@ management_bytes_in(struct management *man, const int size) > > #ifdef MANAGEMENT_DEF_AUTH > > +void man_bytecount_output_server(struct management *man, > + const counter_type *bytes_in_total, > + const counter_type *bytes_out_total, > + struct man_def_auth_context *mdac); > + > static inline void > management_bytes_server(struct management *man, > const counter_type *bytes_in_total, > const counter_type *bytes_out_total, > struct man_def_auth_context *mdac) > { > - void man_bytecount_output_server(struct management *man, > - const counter_type *bytes_in_total, > - const counter_type *bytes_out_total, > - struct man_def_auth_context *mdac); > - > if (man->connection.bytecount_update_seconds > 0 > && now >= mdac->bytecount_last_update + man->connection.bytecount_update_seconds > && (mdac->flags & (DAF_CONNECTION_ESTABLISHED|DAF_CONNECTION_CLOSED)) == DAF_CONNECTION_ESTABLISHED) > diff --git a/src/openvpn/mbuf.h b/src/openvpn/mbuf.h > index e0643de1..1c35432f 100644 > --- a/src/openvpn/mbuf.h > +++ b/src/openvpn/mbuf.h > @@ -96,11 +96,11 @@ mbuf_maximum_queued(const struct mbuf_set *ms) > return (int) ms->max_queued; > } > > +struct multi_instance *mbuf_peek_dowork(struct mbuf_set *ms); > + > static inline struct multi_instance * > mbuf_peek(struct mbuf_set *ms) > { > - struct multi_instance *mbuf_peek_dowork(struct mbuf_set *ms); > - > if (mbuf_defined(ms)) > { > return mbuf_peek_dowork(ms); > diff --git a/src/openvpn/misc.h b/src/openvpn/misc.h > index f6c810a2..2c405f42 100644 > --- a/src/openvpn/misc.h > +++ b/src/openvpn/misc.h > @@ -142,14 +142,6 @@ const char **make_arg_array(const char *first, const char *parms, struct gc_aren > > const char **make_extended_arg_array(char **p, struct gc_arena *gc); > > -/* an analogue to the random() function, but use OpenSSL functions if available */ > -#ifdef ENABLE_CRYPTO > -long int get_random(void); > - > -#else > -#define get_random random > -#endif > - > /* return true if filename can be opened for read */ > bool test_file(const char *filename); > > diff --git a/src/openvpn/mroute.h b/src/openvpn/mroute.h > index 35361fbd..fc37211c 100644 > --- a/src/openvpn/mroute.h > +++ b/src/openvpn/mroute.h > @@ -169,6 +169,16 @@ void mroute_helper_add_iroute46(struct mroute_helper *mh, int netbits); > > void mroute_helper_del_iroute46(struct mroute_helper *mh, int netbits); > > +unsigned int mroute_extract_addr_ip(struct mroute_addr *src, > + struct mroute_addr *dest, > + const struct buffer *buf); > + > +unsigned int mroute_extract_addr_ether(struct mroute_addr *src, > + struct mroute_addr *dest, > + struct mroute_addr *esrc, > + struct mroute_addr *edest, > + const struct buffer *buf); > + > /* > * Given a raw packet in buf, return the src and dest > * addresses of the packet. > @@ -181,16 +191,6 @@ mroute_extract_addr_from_packet(struct mroute_addr *src, > const struct buffer *buf, > int tunnel_type) > { > - unsigned int mroute_extract_addr_ip(struct mroute_addr *src, > - struct mroute_addr *dest, > - const struct buffer *buf); > - > - unsigned int mroute_extract_addr_ether(struct mroute_addr *src, > - struct mroute_addr *dest, > - struct mroute_addr *esrc, > - struct mroute_addr *edest, > - const struct buffer *buf); > - > unsigned int ret = 0; > verify_align_4(buf); > if (tunnel_type == DEV_TYPE_TUN) > diff --git a/src/openvpn/multi.h b/src/openvpn/multi.h > index 63afbaf0..5892ac07 100644 > --- a/src/openvpn/multi.h > +++ b/src/openvpn/multi.h > @@ -536,11 +536,12 @@ clear_prefix(void) > */ > #define MULTI_CACHE_ROUTE_TTL 60 > > +void multi_reap_process_dowork(const struct multi_context *m); > +void multi_process_per_second_timers_dowork(struct multi_context *m); > + > static inline void > multi_reap_process(const struct multi_context *m) > { > - void multi_reap_process_dowork(const struct multi_context *m); > - > if (m->reaper->last_call != now) > { > multi_reap_process_dowork(m); > @@ -552,8 +553,6 @@ multi_process_per_second_timers(struct multi_context *m) > { > if (m->per_second_trigger != now) > { > - void multi_process_per_second_timers_dowork(struct multi_context *m); > - > multi_process_per_second_timers_dowork(m); > m->per_second_trigger = now; > } > diff --git a/src/openvpn/occ.h b/src/openvpn/occ.h > index 369ebac4..bfb08562 100644 > --- a/src/openvpn/occ.h > +++ b/src/openvpn/occ.h > @@ -90,6 +90,16 @@ is_occ_msg(const struct buffer *buf) > > void process_received_occ_msg(struct context *c); > > +void check_send_occ_req_dowork(struct context *c); > + > +void check_send_occ_load_test_dowork(struct context *c); > + > +void check_send_occ_msg_dowork(struct context *c); > + > +/* > + * Inline functions > + */ > + > static inline int > occ_reset_op(void) > { > @@ -102,8 +112,6 @@ occ_reset_op(void) > static inline void > check_send_occ_req(struct context *c) > { > - void check_send_occ_req_dowork(struct context *c); > - > if (event_timeout_defined(&c->c2.occ_interval) > && event_timeout_trigger(&c->c2.occ_interval, > &c->c2.timeval, > @@ -119,8 +127,6 @@ check_send_occ_req(struct context *c) > static inline void > check_send_occ_load_test(struct context *c) > { > - void check_send_occ_load_test_dowork(struct context *c); > - > if (event_timeout_defined(&c->c2.occ_mtu_load_test_interval) > && event_timeout_trigger(&c->c2.occ_mtu_load_test_interval, > &c->c2.timeval, > @@ -136,8 +142,6 @@ check_send_occ_load_test(struct context *c) > static inline void > check_send_occ_msg(struct context *c) > { > - void check_send_occ_msg_dowork(struct context *c); > - > if (c->c2.occ_op >= 0) > { > if (!TO_LINK_DEF(c)) > diff --git a/src/openvpn/pf.h b/src/openvpn/pf.h > index a53ea7e4..42fbc26e 100644 > --- a/src/openvpn/pf.h > +++ b/src/openvpn/pf.h > @@ -121,6 +121,13 @@ pf_addr_test(const struct pf_context *src_pf, const struct context *src, > } > } > > +/* > + * Inline functions > + */ > + > +#define PCT_SRC 1 > +#define PCT_DEST 2 > + > bool pf_cn_test(struct pf_set *pfs, const struct tls_multi *tm, const int type, > const char *prefix); > > diff --git a/src/openvpn/ping.h b/src/openvpn/ping.h > index 9c5ef8e1..ff2eb939 100644 > --- a/src/openvpn/ping.h > +++ b/src/openvpn/ping.h > @@ -43,6 +43,10 @@ is_ping_msg(const struct buffer *buf) > return buf_string_match(buf, ping_string, PING_STRING_SIZE); > } > > +void check_ping_restart_dowork(struct context *c); > + > +void check_ping_send_dowork(struct context *c); > + > /* > * Should we exit or restart due to ping (or other authenticated packet) > * not received in n seconds? > diff --git a/src/openvpn/plugin.h b/src/openvpn/plugin.h > index 0cffee0f..1c98857f 100644 > --- a/src/openvpn/plugin.h > +++ b/src/openvpn/plugin.h > @@ -215,4 +215,6 @@ plugin_call(const struct plugin_list *pl, > ); > } > > +void plugin_abort(void); > + > #endif /* OPENVPN_PLUGIN_H */ > diff --git a/src/openvpn/socket.h b/src/openvpn/socket.h > index 2d7f2187..b0fb55e1 100644 > --- a/src/openvpn/socket.h > +++ b/src/openvpn/socket.h > @@ -1009,11 +1009,11 @@ void stream_buf_close(struct stream_buf *sb); > > bool stream_buf_added(struct stream_buf *sb, int length_added); > > +bool stream_buf_read_setup_dowork(struct link_socket *sock); > + > static inline bool > stream_buf_read_setup(struct link_socket *sock) > { > - bool stream_buf_read_setup_dowork(struct link_socket *sock); > - > if (link_socket_connection_oriented(sock)) > { > return stream_buf_read_setup_dowork(sock); > @@ -1118,16 +1118,17 @@ link_socket_write_win32(struct link_socket *sock, > > #else /* ifdef _WIN32 */ > > +size_t link_socket_write_udp_posix_sendmsg(struct link_socket *sock, > + struct buffer *buf, > + struct link_socket_actual *to); > + > + > static inline size_t > link_socket_write_udp_posix(struct link_socket *sock, > struct buffer *buf, > struct link_socket_actual *to) > { > #if ENABLE_IP_PKTINFO > - size_t link_socket_write_udp_posix_sendmsg(struct link_socket *sock, > - struct buffer *buf, > - struct link_socket_actual *to); > - > if (proto_is_udp(sock->info.proto) && (sock->sockflags & SF_USE_IP_PKTINFO) > && addr_defined_ipi(to)) > { > (Surprisingly) this patch still applies cleanly on top of 1/3 and 2/3 v6, looks sane and safe, compiles without warnings and passes 'make check'. Reviewed-by: Steffan Karger <steffan@karger.me> Acked-by: Steffan Karger <steffan@karger.me> -Steffan ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot
On Sun, Nov 12, 2017 at 12:18:36AM +0800, Antonio Quartulli wrote: > --- a/src/openvpn/crypto.h > +++ b/src/openvpn/crypto.h > @@ -459,6 +459,9 @@ void prng_bytes(uint8_t *output, int len); > > void prng_uninit(void); > > +/* an analogue to the random() function, but use prng_bytes */ > +long int get_random(void); > + > void test_crypto(struct crypto_options *co, struct frame *f); > > > @@ -514,5 +517,10 @@ key_ctx_bi_defined(const struct key_ctx_bi *key) > } > > > +#else > + > +/* use plain random is no crypto support is compiled */ Minor typo, "is" -> "if" > +#define get_random random > + > #endif /* ENABLE_CRYPTO */ > #endif /* CRYPTO_H */ Regards Simon
On 13/11/17 04:22, Simon Ruderich wrote: > On Sun, Nov 12, 2017 at 12:18:36AM +0800, Antonio Quartulli wrote: >> --- a/src/openvpn/crypto.h >> +++ b/src/openvpn/crypto.h >> @@ -459,6 +459,9 @@ void prng_bytes(uint8_t *output, int len); >> >> void prng_uninit(void); >> >> +/* an analogue to the random() function, but use prng_bytes */ >> +long int get_random(void); >> + >> void test_crypto(struct crypto_options *co, struct frame *f); >> >> >> @@ -514,5 +517,10 @@ key_ctx_bi_defined(const struct key_ctx_bi *key) >> } >> >> >> +#else >> + >> +/* use plain random is no crypto support is compiled */ > > Minor typo, "is" -> "if" > Thanks for spotting this! I hope the committer can fix this on the fly. Cheers,
Your patch has been applied to the master branch.
There was a bit of hassle again due to ENABLE_CRYPTO (so the comment about
the typo in the comment ended up being moot anyway, because that was
#ifndef ENABLE_CRYPTO) and also because someone took out so much stuff
from misc.h that git could find the proper spot on its own anymore :-)
Verified that the end result still is what we think it is with
--color-moved=zebra - and by test building, of course.
commit 632af53a515aa1570028f9f82e4b11ab7171f3a3
Author: Antonio Quartulli
Date: Sun Nov 12 00:18:36 2017 +0800
ensure function declarations are compiled with their definitions
Signed-off-by: Antonio Quartulli <antonio@openvpn.net>
Acked-by: Steffan Karger <steffan.karger@fox-it.com>
Message-Id: <20171111161836.23356-3-a@unstable.cc>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg15820.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
--
kind regards,
Gert Doering
diff --git a/src/openvpn/crypto.h b/src/openvpn/crypto.h index 6d60ef8c..c489ef1e 100644 --- a/src/openvpn/crypto.h +++ b/src/openvpn/crypto.h @@ -459,6 +459,9 @@ void prng_bytes(uint8_t *output, int len); void prng_uninit(void); +/* an analogue to the random() function, but use prng_bytes */ +long int get_random(void); + void test_crypto(struct crypto_options *co, struct frame *f); @@ -514,5 +517,10 @@ key_ctx_bi_defined(const struct key_ctx_bi *key) } +#else + +/* use plain random is no crypto support is compiled */ +#define get_random random + #endif /* ENABLE_CRYPTO */ #endif /* CRYPTO_H */ diff --git a/src/openvpn/error.c b/src/openvpn/error.c index 26455455..33806e44 100644 --- a/src/openvpn/error.c +++ b/src/openvpn/error.c @@ -31,6 +31,7 @@ #include "error.h" #include "buffer.h" +#include "init.h" #include "misc.h" #include "win32.h" #include "socket.h" @@ -734,13 +735,6 @@ openvpn_exit(const int status) { if (!forked) { - void tun_abort(); - -#ifdef ENABLE_PLUGIN - void plugin_abort(void); - -#endif - tun_abort(); #ifdef _WIN32 diff --git a/src/openvpn/forward.h b/src/openvpn/forward.h index 0b7f1250..248c941e 100644 --- a/src/openvpn/forward.h +++ b/src/openvpn/forward.h @@ -63,6 +63,41 @@ #define IOW_READ (IOW_READ_TUN|IOW_READ_LINK) +extern counter_type link_read_bytes_global; + +extern counter_type link_write_bytes_global; + +#ifdef ENABLE_CRYPTO +void check_tls_dowork(struct context *c); + +void check_tls_errors_co(struct context *c); + +void check_tls_errors_nco(struct context *c); +#endif /* ENABLE_CRYPTO */ + +#if P2MP +void check_incoming_control_channel_dowork(struct context *c); + +void check_scheduled_exit_dowork(struct context *c); + +void check_push_request_dowork(struct context *c); +#endif /* P2MP */ + +#ifdef ENABLE_FRAGMENT +void check_fragment_dowork(struct context *c); +#endif /* ENABLE_FRAGMENT */ + +void check_connection_established_dowork(struct context *c); + +void check_add_routes_dowork(struct context *c); + +void check_inactivity_timeout_dowork(struct context *c); + +void check_server_poll_timeout_dowork(struct context *c); + +void check_status_file_dowork(struct context *c); + +void io_wait_dowork(struct context *c, const unsigned int flags); void pre_select(struct context *c); diff --git a/src/openvpn/fragment.c b/src/openvpn/fragment.c index 84f01214..36588060 100644 --- a/src/openvpn/fragment.c +++ b/src/openvpn/fragment.c @@ -31,6 +31,7 @@ #ifdef ENABLE_FRAGMENT +#include "crypto.h" #include "misc.h" #include "fragment.h" #include "integer.h" diff --git a/src/openvpn/gremlin.c b/src/openvpn/gremlin.c index e85ce9cf..dca506a9 100644 --- a/src/openvpn/gremlin.c +++ b/src/openvpn/gremlin.c @@ -38,6 +38,7 @@ #include "error.h" #include "common.h" +#include "crypto.h" #include "misc.h" #include "otime.h" #include "gremlin.h" diff --git a/src/openvpn/init.h b/src/openvpn/init.h index 15feb677..b681cd9d 100644 --- a/src/openvpn/init.h +++ b/src/openvpn/init.h @@ -140,4 +140,6 @@ void open_plugins(struct context *c, const bool import_options, int init_point); #endif +void tun_abort(void); + #endif /* ifndef INIT_H */ diff --git a/src/openvpn/lladdr.c b/src/openvpn/lladdr.c index ff71e48c..ea35e4d9 100644 --- a/src/openvpn/lladdr.c +++ b/src/openvpn/lladdr.c @@ -11,6 +11,7 @@ #include "syshead.h" #include "error.h" #include "misc.h" +#include "lladdr.h" int set_lladdr(const char *ifname, const char *lladdr, diff --git a/src/openvpn/manage.h b/src/openvpn/manage.h index 676be640..23339ee7 100644 --- a/src/openvpn/manage.h +++ b/src/openvpn/manage.h @@ -583,17 +583,17 @@ management_bytes_in(struct management *man, const int size) #ifdef MANAGEMENT_DEF_AUTH +void man_bytecount_output_server(struct management *man, + const counter_type *bytes_in_total, + const counter_type *bytes_out_total, + struct man_def_auth_context *mdac); + static inline void management_bytes_server(struct management *man, const counter_type *bytes_in_total, const counter_type *bytes_out_total, struct man_def_auth_context *mdac) { - void man_bytecount_output_server(struct management *man, - const counter_type *bytes_in_total, - const counter_type *bytes_out_total, - struct man_def_auth_context *mdac); - if (man->connection.bytecount_update_seconds > 0 && now >= mdac->bytecount_last_update + man->connection.bytecount_update_seconds && (mdac->flags & (DAF_CONNECTION_ESTABLISHED|DAF_CONNECTION_CLOSED)) == DAF_CONNECTION_ESTABLISHED) diff --git a/src/openvpn/mbuf.h b/src/openvpn/mbuf.h index e0643de1..1c35432f 100644 --- a/src/openvpn/mbuf.h +++ b/src/openvpn/mbuf.h @@ -96,11 +96,11 @@ mbuf_maximum_queued(const struct mbuf_set *ms) return (int) ms->max_queued; } +struct multi_instance *mbuf_peek_dowork(struct mbuf_set *ms); + static inline struct multi_instance * mbuf_peek(struct mbuf_set *ms) { - struct multi_instance *mbuf_peek_dowork(struct mbuf_set *ms); - if (mbuf_defined(ms)) { return mbuf_peek_dowork(ms); diff --git a/src/openvpn/misc.h b/src/openvpn/misc.h index f6c810a2..2c405f42 100644 --- a/src/openvpn/misc.h +++ b/src/openvpn/misc.h @@ -142,14 +142,6 @@ const char **make_arg_array(const char *first, const char *parms, struct gc_aren const char **make_extended_arg_array(char **p, struct gc_arena *gc); -/* an analogue to the random() function, but use OpenSSL functions if available */ -#ifdef ENABLE_CRYPTO -long int get_random(void); - -#else -#define get_random random -#endif - /* return true if filename can be opened for read */ bool test_file(const char *filename); diff --git a/src/openvpn/mroute.h b/src/openvpn/mroute.h index 35361fbd..fc37211c 100644 --- a/src/openvpn/mroute.h +++ b/src/openvpn/mroute.h @@ -169,6 +169,16 @@ void mroute_helper_add_iroute46(struct mroute_helper *mh, int netbits); void mroute_helper_del_iroute46(struct mroute_helper *mh, int netbits); +unsigned int mroute_extract_addr_ip(struct mroute_addr *src, + struct mroute_addr *dest, + const struct buffer *buf); + +unsigned int mroute_extract_addr_ether(struct mroute_addr *src, + struct mroute_addr *dest, + struct mroute_addr *esrc, + struct mroute_addr *edest, + const struct buffer *buf); + /* * Given a raw packet in buf, return the src and dest * addresses of the packet. @@ -181,16 +191,6 @@ mroute_extract_addr_from_packet(struct mroute_addr *src, const struct buffer *buf, int tunnel_type) { - unsigned int mroute_extract_addr_ip(struct mroute_addr *src, - struct mroute_addr *dest, - const struct buffer *buf); - - unsigned int mroute_extract_addr_ether(struct mroute_addr *src, - struct mroute_addr *dest, - struct mroute_addr *esrc, - struct mroute_addr *edest, - const struct buffer *buf); - unsigned int ret = 0; verify_align_4(buf); if (tunnel_type == DEV_TYPE_TUN) diff --git a/src/openvpn/multi.h b/src/openvpn/multi.h index 63afbaf0..5892ac07 100644 --- a/src/openvpn/multi.h +++ b/src/openvpn/multi.h @@ -536,11 +536,12 @@ clear_prefix(void) */ #define MULTI_CACHE_ROUTE_TTL 60 +void multi_reap_process_dowork(const struct multi_context *m); +void multi_process_per_second_timers_dowork(struct multi_context *m); + static inline void multi_reap_process(const struct multi_context *m) { - void multi_reap_process_dowork(const struct multi_context *m); - if (m->reaper->last_call != now) { multi_reap_process_dowork(m); @@ -552,8 +553,6 @@ multi_process_per_second_timers(struct multi_context *m) { if (m->per_second_trigger != now) { - void multi_process_per_second_timers_dowork(struct multi_context *m); - multi_process_per_second_timers_dowork(m); m->per_second_trigger = now; } diff --git a/src/openvpn/occ.h b/src/openvpn/occ.h index 369ebac4..bfb08562 100644 --- a/src/openvpn/occ.h +++ b/src/openvpn/occ.h @@ -90,6 +90,16 @@ is_occ_msg(const struct buffer *buf) void process_received_occ_msg(struct context *c); +void check_send_occ_req_dowork(struct context *c); + +void check_send_occ_load_test_dowork(struct context *c); + +void check_send_occ_msg_dowork(struct context *c); + +/* + * Inline functions + */ + static inline int occ_reset_op(void) { @@ -102,8 +112,6 @@ occ_reset_op(void) static inline void check_send_occ_req(struct context *c) { - void check_send_occ_req_dowork(struct context *c); - if (event_timeout_defined(&c->c2.occ_interval) && event_timeout_trigger(&c->c2.occ_interval, &c->c2.timeval, @@ -119,8 +127,6 @@ check_send_occ_req(struct context *c) static inline void check_send_occ_load_test(struct context *c) { - void check_send_occ_load_test_dowork(struct context *c); - if (event_timeout_defined(&c->c2.occ_mtu_load_test_interval) && event_timeout_trigger(&c->c2.occ_mtu_load_test_interval, &c->c2.timeval, @@ -136,8 +142,6 @@ check_send_occ_load_test(struct context *c) static inline void check_send_occ_msg(struct context *c) { - void check_send_occ_msg_dowork(struct context *c); - if (c->c2.occ_op >= 0) { if (!TO_LINK_DEF(c)) diff --git a/src/openvpn/pf.h b/src/openvpn/pf.h index a53ea7e4..42fbc26e 100644 --- a/src/openvpn/pf.h +++ b/src/openvpn/pf.h @@ -121,6 +121,13 @@ pf_addr_test(const struct pf_context *src_pf, const struct context *src, } } +/* + * Inline functions + */ + +#define PCT_SRC 1 +#define PCT_DEST 2 + bool pf_cn_test(struct pf_set *pfs, const struct tls_multi *tm, const int type, const char *prefix); diff --git a/src/openvpn/ping.h b/src/openvpn/ping.h index 9c5ef8e1..ff2eb939 100644 --- a/src/openvpn/ping.h +++ b/src/openvpn/ping.h @@ -43,6 +43,10 @@ is_ping_msg(const struct buffer *buf) return buf_string_match(buf, ping_string, PING_STRING_SIZE); } +void check_ping_restart_dowork(struct context *c); + +void check_ping_send_dowork(struct context *c); + /* * Should we exit or restart due to ping (or other authenticated packet) * not received in n seconds? diff --git a/src/openvpn/plugin.h b/src/openvpn/plugin.h index 0cffee0f..1c98857f 100644 --- a/src/openvpn/plugin.h +++ b/src/openvpn/plugin.h @@ -215,4 +215,6 @@ plugin_call(const struct plugin_list *pl, ); } +void plugin_abort(void); + #endif /* OPENVPN_PLUGIN_H */ diff --git a/src/openvpn/socket.h b/src/openvpn/socket.h index 2d7f2187..b0fb55e1 100644 --- a/src/openvpn/socket.h +++ b/src/openvpn/socket.h @@ -1009,11 +1009,11 @@ void stream_buf_close(struct stream_buf *sb); bool stream_buf_added(struct stream_buf *sb, int length_added); +bool stream_buf_read_setup_dowork(struct link_socket *sock); + static inline bool stream_buf_read_setup(struct link_socket *sock) { - bool stream_buf_read_setup_dowork(struct link_socket *sock); - if (link_socket_connection_oriented(sock)) { return stream_buf_read_setup_dowork(sock); @@ -1118,16 +1118,17 @@ link_socket_write_win32(struct link_socket *sock, #else /* ifdef _WIN32 */ +size_t link_socket_write_udp_posix_sendmsg(struct link_socket *sock, + struct buffer *buf, + struct link_socket_actual *to); + + static inline size_t link_socket_write_udp_posix(struct link_socket *sock, struct buffer *buf, struct link_socket_actual *to) { #if ENABLE_IP_PKTINFO - size_t link_socket_write_udp_posix_sendmsg(struct link_socket *sock, - struct buffer *buf, - struct link_socket_actual *to); - if (proto_is_udp(sock->info.proto) && (sock->sockflags & SF_USE_IP_PKTINFO) && addr_defined_ipi(to)) {