Re: remove needless #ifdef
committed. Thanks On Fri, 14 Feb 2020 08:48:06 +0100 Claudio Jeker wrote: > On Thu, Feb 13, 2020 at 11:50:46PM +0100, Jan Stary wrote: >> On Feb 10 09:28:38, yasu...@openbsd.org wrote: >> > Hi, >> > >> > On Sun, 09 Feb 2020 19:28:50 +0100 >> > Jeremie Courreges-Anglas wrote: >> > > On Sun, Feb 09 2020, Jan Stary wrote: >> > >> Currently, sys/net/pipex_local.h asks #ifdef __OpenBSD__ >> > >> and if so, defines "Static" to be nothing, to use it later. >> > >> That can go away, right? >> > > >> > > I believe that's something the IIJ folks want to keep, cc'ing Yasuoka. >> > >> > I once thought keeping "static" is better for maintaining the code, >> > but now I don't think it's necessary. So it's ok to remove them. >> >> So can we remove the please? > > Yes. OK claudio > >> Jan >> >> > >> >> > >> Index: sys/net/pipex_local.h >> > >> === >> > >> RCS file: /cvs/src/sys/net/pipex_local.h,v >> > >> retrieving revision 1.30 >> > >> diff -u -p -r1.30 pipex_local.h >> > >> --- sys/net/pipex_local.h 31 Jan 2019 18:01:14 - 1.30 >> > >> +++ sys/net/pipex_local.h 9 Feb 2020 15:26:51 - >> > >> @@ -26,12 +26,6 @@ >> > >> * SUCH DAMAGE. >> > >> */ >> > >> >> > >> -#ifdef __OpenBSD__ >> > >> -#define Static >> > >> -#else >> > >> -#define Static static >> > >> -#endif >> > >> - >> > >> #definePIPEX_PPTP 1 >> > >> #definePIPEX_L2TP 1 >> > >> #definePIPEX_PPPOE 1 >> > >> @@ -372,59 +366,56 @@ extern struct pipex_hash_head pipex_id_h >> > >> #define PIPEX_TCP_OPTLEN 40 >> > >> #definePIPEX_L2TP_MINLEN 8 >> > >> >> > >> -/* >> > >> - * static function prototypes >> > >> - */ >> > >> -Static void pipex_iface_start (struct >> > >> pipex_iface_context *); >> > >> -Static void pipex_iface_stop (struct >> > >> pipex_iface_context *); >> > >> -Static int pipex_add_session (struct >> > >> pipex_session_req *, struct pipex_iface_context *); >> > >> -Static int pipex_close_session (struct >> > >> pipex_session_close_req *); >> > >> -Static int pipex_config_session (struct >> > >> pipex_session_config_req *); >> > >> -Static int pipex_get_stat (struct >> > >> pipex_session_stat_req *); >> > >> -Static int pipex_get_closed (struct >> > >> pipex_session_list_req *); >> > >> -Static int pipex_destroy_session (struct >> > >> pipex_session *); >> > >> -Static struct pipex_session *pipex_lookup_by_ip_address (struct >> > >> in_addr); >> > >> -Static struct pipex_session *pipex_lookup_by_session_id (int, int); >> > >> -Static void pipex_ip_output (struct mbuf *, struct >> > >> pipex_session *); >> > >> -Static void pipex_ppp_output (struct mbuf *, struct >> > >> pipex_session *, int); >> > >> -Static int pipex_ppp_proto (struct mbuf *, struct >> > >> pipex_session *, int, int *); >> > >> -Static void pipex_ppp_input (struct mbuf *, struct >> > >> pipex_session *, int); >> > >> -Static void pipex_ip_input (struct mbuf *, struct >> > >> pipex_session *); >> > >> +void pipex_iface_start (struct pipex_iface_context *); >> > >> +void pipex_iface_stop (struct pipex_iface_context *); >> > >> +int pipex_add_session (struct pipex_session_req *, >> > >> struct pipex_iface_context *); >> > >> +int pipex_close_session (struct >> > >> pipex_session_close_req *); >> > >> +int pipex_config_session (struct >> > >> pipex_session_config_req *); >> > >> +int pipex_get_stat (struct pipex_session_stat_req *); >> > >> +int pipex_get_closed (struct pipex_session_list_req >> > >> *); >> > >> +int pipex_destroy_session (struct pipex_session *); >> > >> +struct pipex_session *pipex_lookup_by_ip_address (struct in_addr); >> > >> +struct pipex_session *pipex_lookup_by_session_id (int, int); >> > >> +void pipex_ip_output (struct mbuf *, struct >> > >> pipex_session *); >> > >> +void pipex_ppp_output (struct mbuf *, struct >> > >> pipex_session *, int); >> > >> +int pipex_ppp_proto (struct mbuf *, struct >> > >> pipex_session *, int, int *); >> > >> +void pipex_ppp_input (struct mbuf *, struct >> > >> pipex_session *, int); >> > >> +void pipex_ip_input (struct mbuf *, struct >> > >> pipex_session *); >> > >> #ifdef INET6 >> > >> -Static void pipex_ip6_input (struct mbuf *, struct >> > >> pipex_session *); >> > >> +void pipex_ip6_input (struct mbuf *, struct >> > >> pipex_session *); >> > >> #endif >> > >> -Static struct mbuf *pipex_common_input(struct pipex_session >> > >> *, struc
Re: remove needless #ifdef
On Thu, Feb 13, 2020 at 11:50:46PM +0100, Jan Stary wrote: > On Feb 10 09:28:38, yasu...@openbsd.org wrote: > > Hi, > > > > On Sun, 09 Feb 2020 19:28:50 +0100 > > Jeremie Courreges-Anglas wrote: > > > On Sun, Feb 09 2020, Jan Stary wrote: > > >> Currently, sys/net/pipex_local.h asks #ifdef __OpenBSD__ > > >> and if so, defines "Static" to be nothing, to use it later. > > >> That can go away, right? > > > > > > I believe that's something the IIJ folks want to keep, cc'ing Yasuoka. > > > > I once thought keeping "static" is better for maintaining the code, > > but now I don't think it's necessary. So it's ok to remove them. > > So can we remove the please? Yes. OK claudio > Jan > > > >> > > >> Index: sys/net/pipex_local.h > > >> === > > >> RCS file: /cvs/src/sys/net/pipex_local.h,v > > >> retrieving revision 1.30 > > >> diff -u -p -r1.30 pipex_local.h > > >> --- sys/net/pipex_local.h31 Jan 2019 18:01:14 - 1.30 > > >> +++ sys/net/pipex_local.h9 Feb 2020 15:26:51 - > > >> @@ -26,12 +26,6 @@ > > >> * SUCH DAMAGE. > > >> */ > > >> > > >> -#ifdef __OpenBSD__ > > >> -#define Static > > >> -#else > > >> -#define Static static > > >> -#endif > > >> - > > >> #define PIPEX_PPTP 1 > > >> #define PIPEX_L2TP 1 > > >> #define PIPEX_PPPOE 1 > > >> @@ -372,59 +366,56 @@ extern struct pipex_hash_head pipex_id_h > > >> #define PIPEX_TCP_OPTLEN 40 > > >> #define PIPEX_L2TP_MINLEN 8 > > >> > > >> -/* > > >> - * static function prototypes > > >> - */ > > >> -Static void pipex_iface_start (struct > > >> pipex_iface_context *); > > >> -Static void pipex_iface_stop (struct > > >> pipex_iface_context *); > > >> -Static int pipex_add_session (struct > > >> pipex_session_req *, struct pipex_iface_context *); > > >> -Static int pipex_close_session (struct > > >> pipex_session_close_req *); > > >> -Static int pipex_config_session (struct > > >> pipex_session_config_req *); > > >> -Static int pipex_get_stat (struct > > >> pipex_session_stat_req *); > > >> -Static int pipex_get_closed (struct > > >> pipex_session_list_req *); > > >> -Static int pipex_destroy_session (struct > > >> pipex_session *); > > >> -Static struct pipex_session *pipex_lookup_by_ip_address (struct > > >> in_addr); > > >> -Static struct pipex_session *pipex_lookup_by_session_id (int, int); > > >> -Static void pipex_ip_output (struct mbuf *, struct > > >> pipex_session *); > > >> -Static void pipex_ppp_output (struct mbuf *, struct > > >> pipex_session *, int); > > >> -Static int pipex_ppp_proto (struct mbuf *, struct > > >> pipex_session *, int, int *); > > >> -Static void pipex_ppp_input (struct mbuf *, struct > > >> pipex_session *, int); > > >> -Static void pipex_ip_input (struct mbuf *, struct > > >> pipex_session *); > > >> +void pipex_iface_start (struct pipex_iface_context *); > > >> +void pipex_iface_stop (struct pipex_iface_context *); > > >> +int pipex_add_session (struct pipex_session_req *, > > >> struct pipex_iface_context *); > > >> +int pipex_close_session (struct > > >> pipex_session_close_req *); > > >> +int pipex_config_session (struct > > >> pipex_session_config_req *); > > >> +int pipex_get_stat (struct pipex_session_stat_req *); > > >> +int pipex_get_closed (struct pipex_session_list_req > > >> *); > > >> +int pipex_destroy_session (struct pipex_session *); > > >> +struct pipex_session *pipex_lookup_by_ip_address (struct in_addr); > > >> +struct pipex_session *pipex_lookup_by_session_id (int, int); > > >> +void pipex_ip_output (struct mbuf *, struct > > >> pipex_session *); > > >> +void pipex_ppp_output (struct mbuf *, struct > > >> pipex_session *, int); > > >> +int pipex_ppp_proto (struct mbuf *, struct > > >> pipex_session *, int, int *); > > >> +void pipex_ppp_input (struct mbuf *, struct > > >> pipex_session *, int); > > >> +void pipex_ip_input (struct mbuf *, struct > > >> pipex_session *); > > >> #ifdef INET6 > > >> -Static void pipex_ip6_input (struct mbuf *, struct > > >> pipex_session *); > > >> +void pipex_ip6_input (struct mbuf *, struct > > >> pipex_session *); > > >> #endif > > >> -Static struct mbuf *pipex_common_input(struct pipex_session > > >> *, struct mbuf *, int, int, int); > > >> +struct mbuf *pipex_common_input(struct pipex_session *, > > >> struct mbuf *, int, int, int); > > >> > > >> #ifdef PIPEX_PPPOE > > >> -Static void pipe
Re: remove needless #ifdef
On Feb 10 09:28:38, yasu...@openbsd.org wrote: > Hi, > > On Sun, 09 Feb 2020 19:28:50 +0100 > Jeremie Courreges-Anglas wrote: > > On Sun, Feb 09 2020, Jan Stary wrote: > >> Currently, sys/net/pipex_local.h asks #ifdef __OpenBSD__ > >> and if so, defines "Static" to be nothing, to use it later. > >> That can go away, right? > > > > I believe that's something the IIJ folks want to keep, cc'ing Yasuoka. > > I once thought keeping "static" is better for maintaining the code, > but now I don't think it's necessary. So it's ok to remove them. So can we remove the please? Jan > >> > >> Index: sys/net/pipex_local.h > >> === > >> RCS file: /cvs/src/sys/net/pipex_local.h,v > >> retrieving revision 1.30 > >> diff -u -p -r1.30 pipex_local.h > >> --- sys/net/pipex_local.h 31 Jan 2019 18:01:14 - 1.30 > >> +++ sys/net/pipex_local.h 9 Feb 2020 15:26:51 - > >> @@ -26,12 +26,6 @@ > >> * SUCH DAMAGE. > >> */ > >> > >> -#ifdef __OpenBSD__ > >> -#define Static > >> -#else > >> -#define Static static > >> -#endif > >> - > >> #define PIPEX_PPTP 1 > >> #define PIPEX_L2TP 1 > >> #define PIPEX_PPPOE 1 > >> @@ -372,59 +366,56 @@ extern struct pipex_hash_headpipex_id_h > >> #define PIPEX_TCP_OPTLEN 40 > >> #define PIPEX_L2TP_MINLEN 8 > >> > >> -/* > >> - * static function prototypes > >> - */ > >> -Static void pipex_iface_start (struct > >> pipex_iface_context *); > >> -Static void pipex_iface_stop (struct pipex_iface_context > >> *); > >> -Static int pipex_add_session (struct pipex_session_req > >> *, struct pipex_iface_context *); > >> -Static int pipex_close_session (struct > >> pipex_session_close_req *); > >> -Static int pipex_config_session (struct > >> pipex_session_config_req *); > >> -Static int pipex_get_stat (struct > >> pipex_session_stat_req *); > >> -Static int pipex_get_closed (struct > >> pipex_session_list_req *); > >> -Static int pipex_destroy_session (struct pipex_session > >> *); > >> -Static struct pipex_session *pipex_lookup_by_ip_address (struct in_addr); > >> -Static struct pipex_session *pipex_lookup_by_session_id (int, int); > >> -Static void pipex_ip_output (struct mbuf *, struct > >> pipex_session *); > >> -Static void pipex_ppp_output (struct mbuf *, struct > >> pipex_session *, int); > >> -Static int pipex_ppp_proto (struct mbuf *, struct > >> pipex_session *, int, int *); > >> -Static void pipex_ppp_input (struct mbuf *, struct > >> pipex_session *, int); > >> -Static void pipex_ip_input (struct mbuf *, struct > >> pipex_session *); > >> +void pipex_iface_start (struct pipex_iface_context *); > >> +void pipex_iface_stop (struct pipex_iface_context *); > >> +int pipex_add_session (struct pipex_session_req *, > >> struct pipex_iface_context *); > >> +int pipex_close_session (struct pipex_session_close_req > >> *); > >> +int pipex_config_session (struct > >> pipex_session_config_req *); > >> +int pipex_get_stat (struct pipex_session_stat_req *); > >> +int pipex_get_closed (struct pipex_session_list_req *); > >> +int pipex_destroy_session (struct pipex_session *); > >> +struct pipex_session *pipex_lookup_by_ip_address (struct in_addr); > >> +struct pipex_session *pipex_lookup_by_session_id (int, int); > >> +void pipex_ip_output (struct mbuf *, struct > >> pipex_session *); > >> +void pipex_ppp_output (struct mbuf *, struct > >> pipex_session *, int); > >> +int pipex_ppp_proto (struct mbuf *, struct > >> pipex_session *, int, int *); > >> +void pipex_ppp_input (struct mbuf *, struct > >> pipex_session *, int); > >> +void pipex_ip_input (struct mbuf *, struct pipex_session > >> *); > >> #ifdef INET6 > >> -Static void pipex_ip6_input (struct mbuf *, struct > >> pipex_session *); > >> +void pipex_ip6_input (struct mbuf *, struct > >> pipex_session *); > >> #endif > >> -Static struct mbuf *pipex_common_input(struct pipex_session *, > >> struct mbuf *, int, int, int); > >> +struct mbuf *pipex_common_input(struct pipex_session *, struct > >> mbuf *, int, int, int); > >> > >> #ifdef PIPEX_PPPOE > >> -Static void pipex_pppoe_output (struct mbuf *, struct > >> pipex_session *); > >> +void pipex_pppoe_output (struct mbuf *, struct > >> pipex_session *); > >> #endif > >> > >> #ifdef PIPEX_PPTP > >> -Static void pipex_pptp_output (struct mbuf *, struct > >> pipex_session *, int, int); >
Re: remove needless #ifdef
Hi, On Sun, 09 Feb 2020 19:28:50 +0100 Jeremie Courreges-Anglas wrote: > On Sun, Feb 09 2020, Jan Stary wrote: >> Currently, sys/net/pipex_local.h asks #ifdef __OpenBSD__ >> and if so, defines "Static" to be nothing, to use it later. >> That can go away, right? > > I believe that's something the IIJ folks want to keep, cc'ing Yasuoka. I once thought keeping "static" is better for maintaining the code, but now I don't think it's necessary. So it's ok to remove them. >> Jan >> >> >> Index: sys/net/pipex_local.h >> === >> RCS file: /cvs/src/sys/net/pipex_local.h,v >> retrieving revision 1.30 >> diff -u -p -r1.30 pipex_local.h >> --- sys/net/pipex_local.h31 Jan 2019 18:01:14 - 1.30 >> +++ sys/net/pipex_local.h9 Feb 2020 15:26:51 - >> @@ -26,12 +26,6 @@ >> * SUCH DAMAGE. >> */ >> >> -#ifdef __OpenBSD__ >> -#define Static >> -#else >> -#define Static static >> -#endif >> - >> #define PIPEX_PPTP 1 >> #define PIPEX_L2TP 1 >> #define PIPEX_PPPOE 1 >> @@ -372,59 +366,56 @@ extern struct pipex_hash_head pipex_id_h >> #define PIPEX_TCP_OPTLEN 40 >> #define PIPEX_L2TP_MINLEN 8 >> >> -/* >> - * static function prototypes >> - */ >> -Static void pipex_iface_start (struct pipex_iface_context >> *); >> -Static void pipex_iface_stop (struct pipex_iface_context >> *); >> -Static int pipex_add_session (struct pipex_session_req *, >> struct pipex_iface_context *); >> -Static int pipex_close_session (struct >> pipex_session_close_req *); >> -Static int pipex_config_session (struct >> pipex_session_config_req *); >> -Static int pipex_get_stat (struct pipex_session_stat_req >> *); >> -Static int pipex_get_closed (struct >> pipex_session_list_req *); >> -Static int pipex_destroy_session (struct pipex_session *); >> -Static struct pipex_session *pipex_lookup_by_ip_address (struct in_addr); >> -Static struct pipex_session *pipex_lookup_by_session_id (int, int); >> -Static void pipex_ip_output (struct mbuf *, struct >> pipex_session *); >> -Static void pipex_ppp_output (struct mbuf *, struct >> pipex_session *, int); >> -Static int pipex_ppp_proto (struct mbuf *, struct >> pipex_session *, int, int *); >> -Static void pipex_ppp_input (struct mbuf *, struct >> pipex_session *, int); >> -Static void pipex_ip_input (struct mbuf *, struct >> pipex_session *); >> +void pipex_iface_start (struct pipex_iface_context *); >> +void pipex_iface_stop (struct pipex_iface_context *); >> +int pipex_add_session (struct pipex_session_req *, struct >> pipex_iface_context *); >> +int pipex_close_session (struct pipex_session_close_req >> *); >> +int pipex_config_session (struct pipex_session_config_req >> *); >> +int pipex_get_stat (struct pipex_session_stat_req *); >> +int pipex_get_closed (struct pipex_session_list_req *); >> +int pipex_destroy_session (struct pipex_session *); >> +struct pipex_session *pipex_lookup_by_ip_address (struct in_addr); >> +struct pipex_session *pipex_lookup_by_session_id (int, int); >> +void pipex_ip_output (struct mbuf *, struct pipex_session >> *); >> +void pipex_ppp_output (struct mbuf *, struct pipex_session >> *, int); >> +int pipex_ppp_proto (struct mbuf *, struct pipex_session >> *, int, int *); >> +void pipex_ppp_input (struct mbuf *, struct pipex_session >> *, int); >> +void pipex_ip_input (struct mbuf *, struct pipex_session >> *); >> #ifdef INET6 >> -Static void pipex_ip6_input (struct mbuf *, struct >> pipex_session *); >> +void pipex_ip6_input (struct mbuf *, struct pipex_session >> *); >> #endif >> -Static struct mbuf *pipex_common_input(struct pipex_session *, >> struct mbuf *, int, int, int); >> +struct mbuf *pipex_common_input(struct pipex_session *, struct >> mbuf *, int, int, int); >> >> #ifdef PIPEX_PPPOE >> -Static void pipex_pppoe_output (struct mbuf *, struct >> pipex_session *); >> +void pipex_pppoe_output (struct mbuf *, struct >> pipex_session *); >> #endif >> >> #ifdef PIPEX_PPTP >> -Static void pipex_pptp_output (struct mbuf *, struct >> pipex_session *, int, int); >> -Static struct pipex_session *pipex_pptp_userland_lookup_session(struct >> mbuf *, struct sockaddr *); >> +void pipex_pptp_output (struct mbuf *, struct >> pipex_session *, int, int); >> +struct pipex_session *pipex_pptp_userland_lookup_session(struct mbuf *, >> struct socka
Re: remove needless #ifdef
On Sun, Feb 09 2020, Jan Stary wrote: > Currently, sys/net/pipex_local.h asks #ifdef __OpenBSD__ > and if so, defines "Static" to be nothing, to use it later. > That can go away, right? I believe that's something the IIJ folks want to keep, cc'ing Yasuoka. > Jan > > > Index: sys/net/pipex_local.h > === > RCS file: /cvs/src/sys/net/pipex_local.h,v > retrieving revision 1.30 > diff -u -p -r1.30 pipex_local.h > --- sys/net/pipex_local.h 31 Jan 2019 18:01:14 - 1.30 > +++ sys/net/pipex_local.h 9 Feb 2020 15:26:51 - > @@ -26,12 +26,6 @@ > * SUCH DAMAGE. > */ > > -#ifdef __OpenBSD__ > -#define Static > -#else > -#define Static static > -#endif > - > #define PIPEX_PPTP 1 > #define PIPEX_L2TP 1 > #define PIPEX_PPPOE 1 > @@ -372,59 +366,56 @@ extern struct pipex_hash_head pipex_id_h > #define PIPEX_TCP_OPTLEN 40 > #define PIPEX_L2TP_MINLEN 8 > > -/* > - * static function prototypes > - */ > -Static void pipex_iface_start (struct pipex_iface_context > *); > -Static void pipex_iface_stop (struct pipex_iface_context *); > -Static int pipex_add_session (struct pipex_session_req *, > struct pipex_iface_context *); > -Static int pipex_close_session (struct > pipex_session_close_req *); > -Static int pipex_config_session (struct > pipex_session_config_req *); > -Static int pipex_get_stat (struct pipex_session_stat_req > *); > -Static int pipex_get_closed (struct pipex_session_list_req > *); > -Static int pipex_destroy_session (struct pipex_session *); > -Static struct pipex_session *pipex_lookup_by_ip_address (struct in_addr); > -Static struct pipex_session *pipex_lookup_by_session_id (int, int); > -Static void pipex_ip_output (struct mbuf *, struct > pipex_session *); > -Static void pipex_ppp_output (struct mbuf *, struct > pipex_session *, int); > -Static int pipex_ppp_proto (struct mbuf *, struct > pipex_session *, int, int *); > -Static void pipex_ppp_input (struct mbuf *, struct > pipex_session *, int); > -Static void pipex_ip_input (struct mbuf *, struct > pipex_session *); > +void pipex_iface_start (struct pipex_iface_context *); > +void pipex_iface_stop (struct pipex_iface_context *); > +int pipex_add_session (struct pipex_session_req *, struct > pipex_iface_context *); > +int pipex_close_session (struct pipex_session_close_req *); > +int pipex_config_session (struct pipex_session_config_req > *); > +int pipex_get_stat (struct pipex_session_stat_req *); > +int pipex_get_closed (struct pipex_session_list_req *); > +int pipex_destroy_session (struct pipex_session *); > +struct pipex_session *pipex_lookup_by_ip_address (struct in_addr); > +struct pipex_session *pipex_lookup_by_session_id (int, int); > +void pipex_ip_output (struct mbuf *, struct pipex_session > *); > +void pipex_ppp_output (struct mbuf *, struct pipex_session > *, int); > +int pipex_ppp_proto (struct mbuf *, struct pipex_session > *, int, int *); > +void pipex_ppp_input (struct mbuf *, struct pipex_session > *, int); > +void pipex_ip_input (struct mbuf *, struct pipex_session *); > #ifdef INET6 > -Static void pipex_ip6_input (struct mbuf *, struct > pipex_session *); > +void pipex_ip6_input (struct mbuf *, struct pipex_session > *); > #endif > -Static struct mbuf *pipex_common_input(struct pipex_session *, > struct mbuf *, int, int, int); > +struct mbuf *pipex_common_input(struct pipex_session *, struct > mbuf *, int, int, int); > > #ifdef PIPEX_PPPOE > -Static void pipex_pppoe_output (struct mbuf *, struct > pipex_session *); > +void pipex_pppoe_output (struct mbuf *, struct > pipex_session *); > #endif > > #ifdef PIPEX_PPTP > -Static void pipex_pptp_output (struct mbuf *, struct > pipex_session *, int, int); > -Static struct pipex_session *pipex_pptp_userland_lookup_session(struct mbuf > *, struct sockaddr *); > +void pipex_pptp_output (struct mbuf *, struct pipex_session > *, int, int); > +struct pipex_session *pipex_pptp_userland_lookup_session(struct mbuf *, > struct sockaddr *); > #endif > > #ifdef PIPEX_L2TP > -Static void pipex_l2tp_output (struct mbuf *, struct > pipex_session *); > +void pipex_l2tp_output (struct mbuf *, struct pipex_session > *); > #endif > > #ifdef PIPEX_MPPE > -Static void pipex_mppe_init (struct pipex_mppe
remove needless #ifdef
Currently, sys/net/pipex_local.h asks #ifdef __OpenBSD__ and if so, defines "Static" to be nothing, to use it later. That can go away, right? Jan Index: sys/net/pipex_local.h === RCS file: /cvs/src/sys/net/pipex_local.h,v retrieving revision 1.30 diff -u -p -r1.30 pipex_local.h --- sys/net/pipex_local.h 31 Jan 2019 18:01:14 - 1.30 +++ sys/net/pipex_local.h 9 Feb 2020 15:26:51 - @@ -26,12 +26,6 @@ * SUCH DAMAGE. */ -#ifdef __OpenBSD__ -#define Static -#else -#define Static static -#endif - #definePIPEX_PPTP 1 #definePIPEX_L2TP 1 #definePIPEX_PPPOE 1 @@ -372,59 +366,56 @@ extern struct pipex_hash_head pipex_id_h #define PIPEX_TCP_OPTLEN 40 #definePIPEX_L2TP_MINLEN 8 -/* - * static function prototypes - */ -Static void pipex_iface_start (struct pipex_iface_context *); -Static void pipex_iface_stop (struct pipex_iface_context *); -Static int pipex_add_session (struct pipex_session_req *, struct pipex_iface_context *); -Static int pipex_close_session (struct pipex_session_close_req *); -Static int pipex_config_session (struct pipex_session_config_req *); -Static int pipex_get_stat (struct pipex_session_stat_req *); -Static int pipex_get_closed (struct pipex_session_list_req *); -Static int pipex_destroy_session (struct pipex_session *); -Static struct pipex_session *pipex_lookup_by_ip_address (struct in_addr); -Static struct pipex_session *pipex_lookup_by_session_id (int, int); -Static void pipex_ip_output (struct mbuf *, struct pipex_session *); -Static void pipex_ppp_output (struct mbuf *, struct pipex_session *, int); -Static int pipex_ppp_proto (struct mbuf *, struct pipex_session *, int, int *); -Static void pipex_ppp_input (struct mbuf *, struct pipex_session *, int); -Static void pipex_ip_input (struct mbuf *, struct pipex_session *); +void pipex_iface_start (struct pipex_iface_context *); +void pipex_iface_stop (struct pipex_iface_context *); +int pipex_add_session (struct pipex_session_req *, struct pipex_iface_context *); +int pipex_close_session (struct pipex_session_close_req *); +int pipex_config_session (struct pipex_session_config_req *); +int pipex_get_stat (struct pipex_session_stat_req *); +int pipex_get_closed (struct pipex_session_list_req *); +int pipex_destroy_session (struct pipex_session *); +struct pipex_session *pipex_lookup_by_ip_address (struct in_addr); +struct pipex_session *pipex_lookup_by_session_id (int, int); +void pipex_ip_output (struct mbuf *, struct pipex_session *); +void pipex_ppp_output (struct mbuf *, struct pipex_session *, int); +int pipex_ppp_proto (struct mbuf *, struct pipex_session *, int, int *); +void pipex_ppp_input (struct mbuf *, struct pipex_session *, int); +void pipex_ip_input (struct mbuf *, struct pipex_session *); #ifdef INET6 -Static void pipex_ip6_input (struct mbuf *, struct pipex_session *); +void pipex_ip6_input (struct mbuf *, struct pipex_session *); #endif -Static struct mbuf *pipex_common_input(struct pipex_session *, struct mbuf *, int, int, int); +struct mbuf *pipex_common_input(struct pipex_session *, struct mbuf *, int, int, int); #ifdef PIPEX_PPPOE -Static void pipex_pppoe_output (struct mbuf *, struct pipex_session *); +void pipex_pppoe_output (struct mbuf *, struct pipex_session *); #endif #ifdef PIPEX_PPTP -Static void pipex_pptp_output (struct mbuf *, struct pipex_session *, int, int); -Static struct pipex_session *pipex_pptp_userland_lookup_session(struct mbuf *, struct sockaddr *); +void pipex_pptp_output (struct mbuf *, struct pipex_session *, int, int); +struct pipex_session *pipex_pptp_userland_lookup_session(struct mbuf *, struct sockaddr *); #endif #ifdef PIPEX_L2TP -Static void pipex_l2tp_output (struct mbuf *, struct pipex_session *); +void pipex_l2tp_output (struct mbuf *, struct pipex_session *); #endif #ifdef PIPEX_MPPE -Static void pipex_mppe_init (struct pipex_mppe *, int, int, u_char *, int); -Static void GetNewKeyFromSHA (u_char *, u_char *, int, u_char *); -Static void pipex_mppe_reduce_key (struct pipex_mppe *); -Static void mppe_key_change (struct pipex_mppe *); -Static void pipex_mppe_input (struct mbuf *, struct pipe
