[PATCH v1 1/1] tools/netconsole: Add support for socat

[Ramon Fried]

On Thu, Dec 2, 2021 at 7:10 AM Ramon Fried <rfried.dev at gmail.com> wrote:
>
> On Fri, Nov 26, 2021 at 6:05 PM Andy Shevchenko
> <andy.shevchenko at gmail.com> wrote:
> >
> > On Fri, Nov 19, 2021 at 1:29 AM Ferry Toth <fntoth at gmail.com> wrote:
> > >
> > > Hi,
> > >
> > > Op 17-11-2021 om 18:15 schreef Andy Shevchenko:
> > > > socat is a very powerful tool to work with socets (and not only)
> > > > in UNIX systems. Let's add support for it in netconsole.
> > > >
> > > > Signed-off-by: Andy Shevchenko <andriy.shevchenko at linux.intel.com>
> > > Tested-by: Ferry Toth <fntoth at gmail.com>
> >
> > Thanks!
> >
> > Can thi be applied, please?
> >
> > > > ---
> > > >   tools/netconsole | 12 ++++++++++--
> > > >   1 file changed, 10 insertions(+), 2 deletions(-)
> > > >
> > > > diff --git a/tools/netconsole b/tools/netconsole
> > > > index 1a0ef22244e3..155453320f73 100755
> > > > --- a/tools/netconsole
> > > > +++ b/tools/netconsole
> > > > @@ -34,7 +34,7 @@ if [ -z "${ip}" ] || [ -n "$4" ] ; then
> > > >       usage "Invalid number of arguments"
> > > >   fi
> > > >
> > > > -for nc in netcat nc ; do
> > > > +for nc in socat netcat nc ; do
> > > >       type ${nc} >/dev/null 2>&1 && break
> > > >   done
> > > >
> > > > @@ -47,6 +47,10 @@ if type ncb 2>/dev/null ; then
> > > >       # see if ncb is in $PATH
> > > >       exec ncb ${board_out_port}
> > > >
> > > > +elif [ "${nc}" = "socat" ] ; then
> > > > +     # socat does support broadcast
> > > > +     while ${nc} STDIO "UDP4-LISTEN:${board_out_port}"; do :; done
> > > > +
> > > >   elif [ -x ${0%/*}/ncb ] ; then
> > > >       # maybe it's in the same dir as the netconsole script
> > > >       exec ${0%/*}/ncb ${board_out_port}
> > > > @@ -59,5 +63,9 @@ else
> > > >   fi
> > > >   ) &
> > > >   pid=$!
> > > > -${nc} -u ${ip} ${board_in_port}
> > > > +if [ "${nc}" = "socat" ] ; then
> > > > +     ${nc} - "UDP4:${ip}:${board_in_port}"
> > > > +else
> > > > +     ${nc} -u ${ip} ${board_in_port}
> > > > +fi
> > > >   kill ${pid} 2>/dev/null
> >
> >
> >
> > --
> > With Best Regards,
> > Andy Shevchenko
> Reviewed-by: Ramon Fried <rfried.dev at gmail.com>
Applied to u-boot-net/next,
Thanks.