Hi, thanks for noticing this. I think something went wrong during my last rebase. After working on this branch this morning I also got complaints from travis-ci, but I hadn't noticed that before.
will fix and resend both patches. Cheers, On 18/09/17 16:31, Simon Ruderich wrote: > Hello, > > The patch contains conflict markers. > > On Mon, Aug 28, 2017 at 04:56:20PM +0800, Antonio Quartulli wrote: >> [snip] >> >> diff --git a/src/openvpn/occ.h b/src/openvpn/occ.h >> index 369ebac4..f81e68d7 100644 >> --- a/src/openvpn/occ.h >> +++ b/src/openvpn/occ.h >> @@ -90,6 +90,19 @@ is_occ_msg(const struct buffer *buf) >> >> void process_received_occ_msg(struct context *c); >> >> +<<<<<<< HEAD >> +======= >> +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 >> + */ >> + >> +>>>>>>> 5222207d... ensure function declarations are compiled with their >> definitions > > Here. > >> [snip] >> >> diff --git a/src/openvpn/pf.h b/src/openvpn/pf.h >> index 480d5b7b..e588f0e0 100644 >> --- a/src/openvpn/pf.h >> +++ b/src/openvpn/pf.h >> @@ -104,6 +104,21 @@ void pf_context_print(const struct pf_context *pfc, >> const char *prefix, const in >> >> #endif >> >> +<<<<<<< HEAD >> +======= >> +bool pf_cn_test(struct pf_set *pfs, const struct tls_multi *tm, const int >> type, >> + const char *prefix); >> + >> +bool pf_addr_test_dowork(const struct context *src, >> + const struct mroute_addr *dest, const char >> *prefix); >> + >> +/* >> + * Inline functions >> + */ >> + >> +#define PCT_SRC 1 >> +#define PCT_DEST 2 >> +>>>>>>> 5222207d... ensure function declarations are compiled with their >> definitions > > And here. > > Regards > Simon > -- Antonio Quartulli
signature.asc
Description: OpenPGP digital signature
------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
