Re: [Qemu-devel] Re: [PATCH] slirp/tftp.c: fix mode field

[Sergei Gavrikov]

On Wed, 12 Jan 2011, Stefan Hajnoczi wrote:

> On Wed, Jan 12, 2011 at 7:22 AM, Sergei Gavrikov
> <address@hidden> wrote:
> > diff --git a/slirp/tftp.c b/slirp/tftp.c
> > index 55e4692..a455ad1 100644
> > --- a/slirp/tftp.c
> > +++ b/slirp/tftp.c
> > @@ -311,7 +311,7 @@ static void tftp_handle_rrq(Slirp *slirp, struct tftp_t 
> > *tp, int pktlen)
> >     return;
> >   }
> >
> > -  if (memcmp(&tp->x.tp_buf[k], "octet\0", 6) != 0) {
> > +  if (strcasecmp((const char *)&tp->x.tp_buf[k], "octet") != 0) {
> >       tftp_send_error(spt, 4, "Unsupported transfer mode", tp);
> >       return;
> >   }
> 
> According to RFC 2349 the "tsize" option is also case-insensitive.
> Want to include a fix for that in this patch?

It was good to know. If you mean the below I "merge" that in one. Thank
you for review.

Sergei

Signed-off-by: Sergei Gavrikov <address@hidden>
Acked-by: Stefan Hajnoczi <address@hidden>
----
 slirp/tftp.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/slirp/tftp.c b/slirp/tftp.c
index 55e4692..1821648 100644
--- a/slirp/tftp.c
+++ b/slirp/tftp.c
@@ -311,7 +311,7 @@ static void tftp_handle_rrq(Slirp *slirp, struct tftp_t 
*tp, int pktlen)
     return;
   }
 
-  if (memcmp(&tp->x.tp_buf[k], "octet\0", 6) != 0) {
+  if (strcasecmp((const char *)&tp->x.tp_buf[k], "octet") != 0) {
       tftp_send_error(spt, 4, "Unsupported transfer mode", tp);
       return;
   }
@@ -351,7 +351,7 @@ static void tftp_handle_rrq(Slirp *slirp, struct tftp_t 
*tp, int pktlen)
       value = (const char *)&tp->x.tp_buf[k];
       k += strlen(value) + 1;
 
-      if (strcmp(key, "tsize") == 0) {
+      if (strcasecmp(key, "tsize") == 0) {
          int tsize = atoi(value);
          struct stat stat_p;