I'm merging the current fastpath commits. Robin
On Fri, May 16, 2014 at 14:19 -0700, Daniel Thayer wrote: > Repository : ssh://g...@bro-ids.icir.org/bro > > On branch : fastpath > Link : > https://github.com/bro/bro/commit/d230eed7f83173fa6acf805871a8453074f3de99 > > >--------------------------------------------------------------- > > commit d230eed7f83173fa6acf805871a8453074f3de99 > Author: Daniel Thayer <dntha...@illinois.edu> > Date: Fri May 16 16:05:03 2014 -0500 > > Fix a doc build warning > > > >--------------------------------------------------------------- > > d230eed7f83173fa6acf805871a8453074f3de99 > scripts/base/utils/addrs.bro | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/scripts/base/utils/addrs.bro b/scripts/base/utils/addrs.bro > index 9ebd35b..9e33e6d 100644 > --- a/scripts/base/utils/addrs.bro > +++ b/scripts/base/utils/addrs.bro > @@ -120,11 +120,11 @@ function addr_to_uri(a: addr): string > return fmt("[%s]", a); > } > > -## Given a string, extracts the hex digits and returns a MAC address in the > -## format: 00:a0:32:d7:81:8f. If the string doesn't contain 12 or 16 hex > digits, > -## an empty string is returned. > +## Given a string, extracts the hex digits and returns a MAC address in > +## the format: 00:a0:32:d7:81:8f. If the string doesn't contain 12 or 16 hex > +## digits, an empty string is returned. > ## > -## a: the string to normalize > +## a: the string to normalize. > ## > ## Returns: a normalized MAC address, or an empty string in the case of an > error. > function normalize_mac(a: string): string > > _______________________________________________ > bro-commits mailing list > bro-comm...@bro.org > http://mailman.icsi.berkeley.edu/mailman/listinfo/bro-commits > -- Robin Sommer * Phone +1 (510) 722-6541 * ro...@icir.org ICSI/LBNL * Fax +1 (510) 666-2956 * www.icir.org/robin _______________________________________________ bro-dev mailing list bro-dev@bro.org http://mailman.icsi.berkeley.edu/mailman/listinfo/bro-dev