diff --git a/NEWS b/NEWS index 316fe50..7db9c4a 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,12 @@ The new release script will do a "git shortlog" to add the commit messages here. #NEW_STUFF_HERE this is a tag my script looks for. +V0.90 + only fixed the release script. Should now contain fmaxullo's + patch. --rew + fmazullo (1): + Add AS number to json output + V0.89 only made the tag point to the proper commit. --REW diff --git a/ui/report.c b/ui/report.c index 29d7bd6..6c39686 100644 --- a/ui/report.c +++ b/ui/report.c @@ -3,7 +3,7 @@ Copyright (C) 1997,1998 Matt Kimball This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as + it under the terms of the GNU General Public License version 2 as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, @@ -319,6 +319,13 @@ void json_close( } printf(" \"count\": \"%d\",\n", at + 1); printf(" \"host\": \"%s\",\n", name); +#ifdef HAVE_IPINFO + if(!ctl->ipinfo_no) { + char* fmtinfo = fmt_ipinfo(addr); + if (fmtinfo != NULL) fmtinfo = trim(fmtinfo); + printf(" \"ASN\": \"%s\",\n", fmtinfo); + } +#endif for (i = 0; i < MAXFLD; i++) { const char *format; .