Re: iptraf-ng for xen vifvm interfaces...

[Nikola Pajkovsky]

Nikola Pajkovsky  writes:
> Daved Daly  writes:
>
> Hello
> > --- ifaces.c    2010-03-24 04:25:30.000000000 -0700
> > +++ ifaces.c.new        2011-05-22 13:58:08.000000000 -0700
> > @@ -1,4 +1,4 @@
> > -/***
> > /***
>
> Fixing indentation by one char is something what is not part of commit.
> > ifaces.c - routine that determines whether a given interface is supported
> >                 by IPTraf
> > @@ -41,7 +41,7 @@
> >      { "lo", "eth", "sl", "ppp", "ippp", "plip", "fddi", "isdn", "dvb", "pvc",
> >        "hdlc", "ipsec", "sbni", "tr", "wvlan", "wlan", "sm2", "sm3",
> > "pent", "lec",
> >        "brg", "tun", "tap", "cipcb", "tunl", "vlan", "hsi", "ctc",
> > "ath", "bond",
> >  "ra", "bnep", "dsl", "modem", "ni", "br", "tap", "dummy", "vmnet"
> >  "ra", "bnep", "dsl", "modem", "ni", "br", "dummy", "vmnet", "vifvm"
> >
> > };
>
> Broken indentation
> > char *ltrim(char *buf)
> >
> > --- packet.c    2010-03-04 11:03:07.000000000 -0800
> > +++ packet.c.new        2011-05-22 14:01:56.000000000 -0700
> > @@ -110,6 +110,8 @@
> >              result = LINK_ETHERNET;
> >          else if (strncmp(ifname, "tap", 3) == 0)
> >              result = LINK_ETHERNET;
> >   else if (strncmp(ifname, "vifvm", 3) == 0)
> >       result = LINK_ETHERNET;
> >    else if (strncmp(ifname, "ctc", 3) == 0)
> >        result = LINK_ETHERNET;
> >    else if (strncmp(ifname, "hsi", 3) == 0)
> >
> > --- promisc.c   2010-03-24 04:16:29.000000000 -0700
> > +++ promisc.c.new       2011-05-22 14:03:09.000000000 -0700
> > @@ -86,6 +86,7 @@
> >                  || (strncmp(buf, "bnep", 4) == 0)
> >                  || (strncmp(buf, "ni", 2) == 0)
> >                  || (strncmp(buf, "tap", 3) == 0)
> >           || (strncmp(buf, "vifvm", 3) == 0)
> >            || (strncmp(buf, "dummy", 5) == 0)
> >            || (strncmp(buf, "br", 2) == 0)
> >            || (strncmp(buf, "vmnet", 5) == 0)
>
> Ditto.
>
> Patch looks pretty obvious to me, but I use 8 tab to indent code.
>
> Also you don't have to use old school diffing between two files. You are
> using GIT ;)
>
> Just run:
>
> $ git commit -asm "iptraf-ng for xen vifvm interfaces..."
>
> # check if it's ok
> $ git log -p HEAD^

err! $ git log -p HEAD^..
> # prepare commit to send
> $ git format-patch -1
>
> # send patch as you like attachment, git send-email
>
> # drop the patch from master branch. I'm going to apply it.
> git reset --hard HEAD^
>
> That's it ;)