diff --git a/ChangeLog b/ChangeLog index 5395b35..7ac69fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,11 @@ >> Squidview history: +0.81: January 2015 +- squid result code update + thanks to Yuri Voinov for the suggestion + 0.80: October 2013 -- compatability with syslog +- compatibility with syslog v0.79: May 2011: - code clean ups for gcc-4.6 diff --git a/configure b/configure index 1eb533d..dbc3922 100755 --- a/configure +++ b/configure @@ -2604,7 +2604,7 @@ # Define the identity of the package. PACKAGE=squidview - VERSION=0.80 + VERSION=0.81 cat >>confdefs.h <<_ACEOF diff --git a/configure.in b/configure.in index ccf3e70..66f82fa 100644 --- a/configure.in +++ b/configure.in @@ -15,7 +15,7 @@ AC_INIT(squidview.cpp) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(squidview,0.80) +AM_INIT_AUTOMAKE(squidview,0.81) AC_PROG_CXX AC_PROG_INSTALL diff --git a/squidview.cpp b/squidview.cpp index fb20ec6..7d9ed40 100644 --- a/squidview.cpp +++ b/squidview.cpp @@ -17,7 +17,7 @@ A program to nicely browse your squid log - (c) 2001 - 2013 Graeme Sheppard + (c) 2001 - 2015 Graeme Sheppard This program is not how it would be if I had to rewrite it from scratch. It started off very simple (quick and nasty) and needed to be fast because @@ -1343,16 +1343,27 @@ if (iSlash < iLength - 1) sRight = sBoth.substr (iSlash + 1, iLength - iSlash - 1); - if (sLeft == "TCP_MISS") cHit = ' '; else + // should be in table form + // the cache hits, the cache misses and other + if (sLeft == "TCP_HIT") cHit = 'H'; else if (sLeft == "TCP_IMS_HIT") cHit = 'I'; else if (sLeft == "TCP_REFRESH_HIT") cHit = 'R'; else + if (sLeft == "TCP_REFRESH_UNMODIFIED") cHit = 'R'; else if (sLeft == "TCP_NEGATIVE_HIT") cHit = 'N'; else if (sLeft == "TCP_MEM_HIT") cHit = 'M'; else - if (sLeft == "TCP_DENIED") cHit = 'd'; else + if (sLeft == "TCP_HIT_ABORTED") cHit = 'A'; else + if (sLeft == "TCP_REFRESH_FAIL_OLD") cHit = 'F'; else + + if (sLeft == "TCP_MISS") cHit = ' '; else if (sLeft == "TCP_REFRESH_MISS") cHit = 'm'; else + if (sLeft == "TCP_REFRESH_MODIFIED") cHit = 'm'; else if (sLeft == "TCP_CLIENT_REFRESH") cHit = 'r'; else if (sLeft == "TCP_CLIENT_REFRESH_MISS") cHit = 'c'; else + if (sLeft == "TCP_MISS_ABORTED") cHit = 'a'; else + + if (sLeft == "TCP_DENIED") cHit = 'd'; else + if (sLeft == "TAG_NONE") cHit = '0'; else cHit = '?'; iHitNumber = atoi (sRight.c_str()); @@ -5306,7 +5317,7 @@ void Help() { MyCls(); - con << PACKAGE << " " << VERSION << ": (c) " << "2001-2013" + con << PACKAGE << " " << VERSION << ": (c) " << "2001-2015" << " Graeme Sheppard - GPL software\n" << "www.rillion.net/squidview\n\n" << "Keystrokes:-\n\n"