rip_usrreq() style tweak

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

rip_usrreq() style tweak

Michael Mikonos
Hello,

Is it OK to merge the PRU_CONNECT2 case into the generic
"not supported" case in {rip,rip6}_usrreq()?
If anything this allows the reader to see all the
unsupported requests in one place.

- Michael


Index: netinet/raw_ip.c
===================================================================
RCS file: /cvs/src/sys/netinet/raw_ip.c,v
retrieving revision 1.119
diff -u -p -u -r1.119 raw_ip.c
--- netinet/raw_ip.c 4 Feb 2019 21:40:52 -0000 1.119
+++ netinet/raw_ip.c 21 Feb 2019 07:15:08 -0000
@@ -493,10 +493,6 @@ rip_usrreq(struct socket *so, int req, s
  break;
     }
 
- case PRU_CONNECT2:
- error = EOPNOTSUPP;
- break;
-
  /*
  * Mark the connection as being incapable of further input.
  */
@@ -549,6 +545,7 @@ rip_usrreq(struct socket *so, int req, s
  /*
  * Not supported.
  */
+ case PRU_CONNECT2:
  case PRU_LISTEN:
  case PRU_ACCEPT:
  case PRU_SENDOOB:
Index: netinet6/raw_ip6.c
===================================================================
RCS file: /cvs/src/sys/netinet6/raw_ip6.c,v
retrieving revision 1.134
diff -u -p -u -r1.134 raw_ip6.c
--- netinet6/raw_ip6.c 4 Feb 2019 21:40:52 -0000 1.134
+++ netinet6/raw_ip6.c 21 Feb 2019 07:15:09 -0000
@@ -618,10 +618,6 @@ rip6_usrreq(struct socket *so, int req,
  break;
  }
 
- case PRU_CONNECT2:
- error = EOPNOTSUPP;
- break;
-
  /*
  * Mark the connection as being incapable of futther input.
  */
@@ -672,6 +668,7 @@ rip6_usrreq(struct socket *so, int req,
  /*
  * Not supported.
  */
+ case PRU_CONNECT2:
  case PRU_LISTEN:
  case PRU_ACCEPT:
  case PRU_SENDOOB:

Reply | Threaded
Open this post in threaded view
|

Re: rip_usrreq() style tweak

Jeremie Courreges-Anglas-2
On Thu, Feb 21 2019, Michael Mikonos <[hidden email]> wrote:
> Hello,
>
> Is it OK to merge the PRU_CONNECT2 case into the generic
> "not supported" case in {rip,rip6}_usrreq()?
> If anything this allows the reader to see all the
> unsupported requests in one place.

ok with me, one tweak,

> - Michael
>
>
> Index: netinet/raw_ip.c
> ===================================================================
> RCS file: /cvs/src/sys/netinet/raw_ip.c,v
> retrieving revision 1.119
> diff -u -p -u -r1.119 raw_ip.c
> --- netinet/raw_ip.c 4 Feb 2019 21:40:52 -0000 1.119
> +++ netinet/raw_ip.c 21 Feb 2019 07:15:08 -0000
> @@ -493,10 +493,6 @@ rip_usrreq(struct socket *so, int req, s
>   break;
>      }
>  
> - case PRU_CONNECT2:
> - error = EOPNOTSUPP;
> - break;
> -
>   /*
>   * Mark the connection as being incapable of further input.
>   */
> @@ -549,6 +545,7 @@ rip_usrreq(struct socket *so, int req, s
>   /*
>   * Not supported.
>   */
> + case PRU_CONNECT2:
>   case PRU_LISTEN:
>   case PRU_ACCEPT:
>   case PRU_SENDOOB:
> Index: netinet6/raw_ip6.c
> ===================================================================
> RCS file: /cvs/src/sys/netinet6/raw_ip6.c,v
> retrieving revision 1.134
> diff -u -p -u -r1.134 raw_ip6.c
> --- netinet6/raw_ip6.c 4 Feb 2019 21:40:52 -0000 1.134
> +++ netinet6/raw_ip6.c 21 Feb 2019 07:15:09 -0000
> @@ -618,10 +618,6 @@ rip6_usrreq(struct socket *so, int req,
>   break;
>   }
>  
> - case PRU_CONNECT2:
> - error = EOPNOTSUPP;
> - break;
> -
>   /*
>   * Mark the connection as being incapable of futther input.

Can you please s/futther/further/ while here?

>   */
> @@ -672,6 +668,7 @@ rip6_usrreq(struct socket *so, int req,
>   /*
>   * Not supported.
>   */
> + case PRU_CONNECT2:
>   case PRU_LISTEN:
>   case PRU_ACCEPT:
>   case PRU_SENDOOB:
>

--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Reply | Threaded
Open this post in threaded view
|

Re: rip_usrreq() style tweak

Michael Mikonos
On Thu, Feb 21, 2019 at 04:58:08PM +0100, Jeremie Courreges-Anglas wrote:

> On Thu, Feb 21 2019, Michael Mikonos <[hidden email]> wrote:
> > Hello,
> >
> > Is it OK to merge the PRU_CONNECT2 case into the generic
> > "not supported" case in {rip,rip6}_usrreq()?
> > If anything this allows the reader to see all the
> > unsupported requests in one place.
>
> ok with me, one tweak,
>
> > - Michael
> >
> >
> > Index: netinet/raw_ip.c
> > ===================================================================
> > RCS file: /cvs/src/sys/netinet/raw_ip.c,v
> > retrieving revision 1.119
> > diff -u -p -u -r1.119 raw_ip.c
> > --- netinet/raw_ip.c 4 Feb 2019 21:40:52 -0000 1.119
> > +++ netinet/raw_ip.c 21 Feb 2019 07:15:08 -0000
> > @@ -493,10 +493,6 @@ rip_usrreq(struct socket *so, int req, s
> >   break;
> >      }
> >  
> > - case PRU_CONNECT2:
> > - error = EOPNOTSUPP;
> > - break;
> > -
> >   /*
> >   * Mark the connection as being incapable of further input.
> >   */
> > @@ -549,6 +545,7 @@ rip_usrreq(struct socket *so, int req, s
> >   /*
> >   * Not supported.
> >   */
> > + case PRU_CONNECT2:
> >   case PRU_LISTEN:
> >   case PRU_ACCEPT:
> >   case PRU_SENDOOB:
> > Index: netinet6/raw_ip6.c
> > ===================================================================
> > RCS file: /cvs/src/sys/netinet6/raw_ip6.c,v
> > retrieving revision 1.134
> > diff -u -p -u -r1.134 raw_ip6.c
> > --- netinet6/raw_ip6.c 4 Feb 2019 21:40:52 -0000 1.134
> > +++ netinet6/raw_ip6.c 21 Feb 2019 07:15:09 -0000
> > @@ -618,10 +618,6 @@ rip6_usrreq(struct socket *so, int req,
> >   break;
> >   }
> >  
> > - case PRU_CONNECT2:
> > - error = EOPNOTSUPP;
> > - break;
> > -
> >   /*
> >   * Mark the connection as being incapable of futther input.
>
> Can you please s/futther/further/ while here?

Fixed that.

>
> >   */
> > @@ -672,6 +668,7 @@ rip6_usrreq(struct socket *so, int req,
> >   /*
> >   * Not supported.
> >   */
> > + case PRU_CONNECT2:
> >   case PRU_LISTEN:
> >   case PRU_ACCEPT:
> >   case PRU_SENDOOB:
> >
>
> --
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE