Merge pull request #131 from Raizo62/devel

grc.conf : command ip and traceroute :

colourfiles/conf.traceroute

@@ -24,10 +24,8 @@ regexp=\bDUP
 colours=red
 -
 # !S, !A, !H (host unreachable), etc.
-regexp=\b\![AFGNPSTU]
+regexp=\s\!([HNPSFXVC]|\d+)
 colours=red
-# just an example:
-#command=echo 'Network is down'| mail root
 -
 # ttl=...!
 regexp=ttl=\d+\!

grc.conf

@@ -99,18 +99,18 @@ conf.df
 conf.du
 
 # ip addr/link
-(^|[/\w\.]+/)ip a(ddr)*\s?
+(^|[/\w\.]+/)ip( -\w+)* a(d(d(r(e(ss?)?)?)?)?)?\b
 conf.ipaddr
 
-(^|[/\w\.]+/)ip ?(-.)* ?l(ink)*\s?
+(^|[/\w\.]+/)ip( -\w+)* l(i(nk?)?)?\b
 conf.ipaddr
 
 # ip route
-(^|[/\w\.]+/)ip r(oute)*\s?
+(^|[/\w\.]+/)ip( -\w+)* r(o(u(te?)?)?)?\b
 conf.iproute
 
 # ip neighbor
-(^|[/\w\.]+/)ip n(eighbor)*\s?
+(^|[/\w\.]+/)ip( -\w+)* n(e(i(g(h(b(o(ur?)?)?)?)?)?)?)?\b
 conf.ipneighbor
 
 # ip command - rest of commands