diff --git a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp index e0880f6c8..bf27e1969 100644 --- a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp +++ b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp @@ -183,12 +183,7 @@ $(document).ready(function(){ - - - - - - + @@ -197,6 +192,13 @@ $(document).ready(function(){ + + + + + + + @@ -205,7 +207,7 @@ $(document).ready(function(){ - + @@ -233,22 +235,7 @@ $(document).ready(function(){ ${log.foundTime } ${log.recvTime } - - - - - - - - - - - - - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} - ${log.dPort } - ${log.sPort } + @@ -287,6 +274,23 @@ $(document).ready(function(){ ${log.labelAppSource} + ${fns:abbr(log.capIp, 42)} + + + + + + + + + + + + + ${fns:abbr(log.dIp, 42)} + ${fns:abbr(log.sIp, 42)} + ${log.dPort } + ${log.sPort } @@ -310,7 +314,7 @@ $(document).ready(function(){ ${streamType.itemValue} - ${fns:abbr(log.capIp, 42)} + ${log.addrList } ${log.serverLocate} ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp index cde449f48..6c6880971 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp @@ -174,12 +174,7 @@ $(document).ready(function(){ - - - - - - + @@ -188,6 +183,14 @@ $(document).ready(function(){ + + + + + + + + @@ -196,7 +199,7 @@ $(document).ready(function(){ - + @@ -224,22 +227,7 @@ $(document).ready(function(){ ${log.foundTime } ${log.recvTime } - - - - - - - - - - - - - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} - ${log.dPort } - ${log.sPort } + @@ -277,6 +265,24 @@ $(document).ready(function(){ ${log.labelAppSource} + ${fns:abbr(log.capIp, 42)} + + + + + + + + + + + + + ${fns:abbr(log.dIp, 42)} + ${fns:abbr(log.sIp, 42)} + ${log.dPort } + ${log.sPort } + @@ -300,7 +306,7 @@ $(document).ready(function(){ ${streamType.itemValue} - ${fns:abbr(log.capIp, 42)} + ${log.addrList } ${log.serverLocate} ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp index 5316325d9..e7bc7116d 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp @@ -172,13 +172,16 @@ + + + - + @@ -186,7 +189,7 @@ - + @@ -217,6 +220,15 @@ ${log.foundTime } ${log.recvTime } + + + + + + + + + ${fns:abbr(log.capIp, 42)} @@ -233,13 +245,6 @@ ${fns:abbr(log.sIp, 42)} ${log.dPort } ${log.sPort } - - - - - - - @@ -263,7 +268,6 @@ ${streamType.itemValue} - ${fns:abbr(log.capIp, 42)} ${log.addrList } ${log.serverLocate} ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp index 3774fabc3..0dd3680d6 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp @@ -164,14 +164,8 @@ $(document).ready(function(){ - - - - - - - + @@ -180,6 +174,14 @@ $(document).ready(function(){ + + + + + + + + @@ -188,7 +190,7 @@ $(document).ready(function(){ - + @@ -216,22 +218,7 @@ $(document).ready(function(){ ${log.foundTime } ${log.recvTime } - - - - - - - - - - - - - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} - ${log.dPort } - ${log.sPort } + @@ -258,7 +245,23 @@ $(document).ready(function(){ - + ${fns:abbr(log.capIp, 42)} + + + + + + + + + + + + + ${fns:abbr(log.dIp, 42)} + ${fns:abbr(log.sIp, 42)} + ${log.dPort } + ${log.sPort } @@ -282,7 +285,7 @@ $(document).ready(function(){ ${streamType.itemValue} - ${fns:abbr(log.capIp, 42)} + ${log.addrList } ${log.serverLocate} ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp index 055ca43b2..de84cf4f3 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp @@ -181,12 +181,6 @@ - - - - - - @@ -199,6 +193,14 @@ + + + + + + + + @@ -207,7 +209,7 @@ - + @@ -235,22 +237,7 @@ ${log.foundTime } ${log.recvTime } - - - - - - - - - - - - - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} - ${log.dPort } - ${log.sPort } + @@ -291,7 +278,23 @@ ${fns:abbr(log.qname, 30)} ${log.cname } ${log.dnsSub } - + ${fns:abbr(log.capIp, 42)} + + + + + + + + + + + + + ${fns:abbr(log.dIp, 42)} + ${fns:abbr(log.sIp, 42)} + ${log.dPort } + ${log.sPort } @@ -315,7 +318,7 @@ ${streamType.itemValue} - ${fns:abbr(log.capIp, 42)} + ${log.addrList } ${log.serverLocate} ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp index 71ed90fa7..7b58ce4fd 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp @@ -175,16 +175,18 @@ $(document).ready(function(){ + + + + + + - - - - @@ -193,7 +195,7 @@ $(document).ready(function(){ - + @@ -221,22 +223,7 @@ $(document).ready(function(){ ${log.foundTime } ${log.recvTime } - - - - - - - - - - - - - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} - ${log.dPort } - ${log.sPort } + @@ -267,7 +254,23 @@ $(document).ready(function(){ ${log.ftpContent} - + ${fns:abbr(log.capIp, 42)} + + + + + + + + + + + + + ${fns:abbr(log.dIp, 42)} + ${fns:abbr(log.sIp, 42)} + ${log.dPort } + ${log.sPort } @@ -291,7 +294,7 @@ $(document).ready(function(){ ${streamType.itemValue} - ${fns:abbr(log.capIp, 42)} + ${log.addrList } ${log.serverLocate} ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp index 3aaaa9ad5..73820e05a 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp @@ -205,16 +205,19 @@ + + + + URL         + + + - - - URL         - @@ -223,7 +226,7 @@ - + @@ -252,22 +255,7 @@ ${log.foundTime } ${log.recvTime } - - - - - - - - - - - - - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} - ${log.dPort } - ${log.sPort } + @@ -286,7 +274,23 @@ --%> ${log.website } - + ${fns:abbr(log.capIp, 42)} + + + + + + + + + + + + + ${fns:abbr(log.dIp, 42)} + ${fns:abbr(log.sIp, 42)} + ${log.dPort } + ${log.sPort } @@ -310,7 +314,7 @@ ${streamType.itemValue} - ${fns:abbr(log.capIp, 42)} + ${log.addrList } ${log.serverLocate} ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp index 52a14253e..059130be5 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp @@ -181,12 +181,6 @@ - - - - - - URL         @@ -199,6 +193,14 @@ + + + + + + + + @@ -207,7 +209,7 @@ - + @@ -235,22 +237,7 @@ ${log.foundTime } ${log.recvTime } - - - - - - - - - - - - - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} - ${log.dPort } - ${log.sPort } + @@ -329,8 +316,23 @@ ${log.website } - - + ${fns:abbr(log.capIp, 42)} + + + + + + + + + + + + + ${fns:abbr(log.dIp, 42)} + ${fns:abbr(log.sIp, 42)} + ${log.dPort } + ${log.sPort } @@ -354,7 +356,6 @@ ${streamType.itemValue} - ${fns:abbr(log.capIp, 42)} ${log.addrList } ${log.serverLocate} ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp index 22eceaa49..dda479e13 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp @@ -174,13 +174,14 @@ + + - @@ -188,7 +189,7 @@ - + @@ -216,6 +217,14 @@ ${log.foundTime } ${log.recvTime } + + + + + + + + ${fns:abbr(log.capIp, 42)} @@ -232,13 +241,6 @@ ${fns:abbr(log.sIp, 42)} ${log.dPort } ${log.sPort } - - - - - - - @@ -262,7 +264,6 @@ ${streamType.itemValue} - ${fns:abbr(log.capIp, 42)} ${log.addrList } ${log.serverLocate} ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp index d6eee5f4e..7d1b4c01a 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp @@ -161,16 +161,19 @@ $(document).ready(function(){ + + + + + + + - - - - @@ -179,7 +182,7 @@ $(document).ready(function(){ - + @@ -207,22 +210,7 @@ $(document).ready(function(){ ${log.foundTime } ${log.recvTime } - - - - - - - - - - - - - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} - ${log.dPort } - ${log.sPort } + @@ -242,7 +230,23 @@ $(document).ready(function(){ nat_aggre nat_main - + ${fns:abbr(log.capIp, 42)} + + + + + + + + + + + + + ${fns:abbr(log.dIp, 42)} + ${fns:abbr(log.sIp, 42)} + ${log.dPort } + ${log.sPort } @@ -266,7 +270,7 @@ $(document).ready(function(){ ${streamType.itemValue} - ${fns:abbr(log.capIp, 42)} + ${log.addrList } ${log.serverLocate} ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp index 7a15defc1..3f6e21321 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp @@ -173,18 +173,19 @@ + + + + + + + - - - - - - @@ -192,7 +193,7 @@ - + @@ -220,22 +221,7 @@ ${log.foundTime } ${log.recvTime } - - - - - - - - - - - - - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} - ${log.dPort } - ${log.sPort } + @@ -256,6 +242,23 @@ ${log.chapName} + ${fns:abbr(log.capIp, 42)} + + + + + + + + + + + + + ${fns:abbr(log.dIp, 42)} + ${fns:abbr(log.sIp, 42)} + ${log.dPort } + ${log.sPort } @@ -279,7 +282,7 @@ ${streamType.itemValue} - ${fns:abbr(log.capIp, 42)} + ${log.addrList } ${log.serverLocate} ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp index 4c6f2dd88..5f6cc2f9c 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp @@ -172,12 +172,7 @@ - - - - - - + @@ -186,7 +181,13 @@ - + + + + + + + @@ -194,7 +195,7 @@ - + @@ -222,22 +223,7 @@ ${log.foundTime } ${log.recvTime } - - - - - - - - - - - - - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} - ${log.dPort } - ${log.sPort } + @@ -269,7 +255,23 @@ ${fns:abbr(log.emlKey, 42)} - + ${fns:abbr(log.capIp, 42)} + + + + + + + + + + + + + ${fns:abbr(log.dIp, 42)} + ${fns:abbr(log.sIp, 42)} + ${log.dPort } + ${log.sPort } @@ -293,7 +295,6 @@ ${streamType.itemValue} - ${fns:abbr(log.capIp, 42)} ${log.addrList } ${log.serverLocate} ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp index 5ba82c64f..71f94ff28 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp @@ -173,12 +173,7 @@ $(document).ready(function(){ - - - - - - + @@ -188,6 +183,14 @@ $(document).ready(function(){ + + + + + + + + @@ -196,7 +199,7 @@ $(document).ready(function(){ - + @@ -224,22 +227,7 @@ $(document).ready(function(){ ${log.foundTime } ${log.recvTime } - - - - - - - - - - - - - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} - ${log.dPort } - ${log.sPort } + @@ -283,8 +271,23 @@ $(document).ready(function(){ ${log.protocol} - - + ${fns:abbr(log.capIp, 42)} + + + + + + + + + + + + + ${fns:abbr(log.dIp, 42)} + ${fns:abbr(log.sIp, 42)} + ${log.dPort } + ${log.sPort } @@ -308,7 +311,7 @@ $(document).ready(function(){ ${streamType.itemValue} - ${fns:abbr(log.capIp, 42)} + ${log.addrList } ${log.serverLocate} ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp index 8dd92461f..bb9fd7aae 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp @@ -172,12 +172,7 @@ $(document).ready(function(){ - - - - - - + @@ -187,7 +182,13 @@ $(document).ready(function(){ - + + + + + + + @@ -195,7 +196,7 @@ $(document).ready(function(){ - + @@ -223,22 +224,6 @@ $(document).ready(function(){ ${log.foundTime } ${log.recvTime } - - - - - - - - - - - - - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} - ${log.dPort } - ${log.sPort } @@ -282,8 +267,23 @@ $(document).ready(function(){ ${log.protocol} - - + ${fns:abbr(log.capIp, 42)} + + + + + + + + + + + + + ${fns:abbr(log.dIp, 42)} + ${fns:abbr(log.sIp, 42)} + ${log.dPort } + ${log.sPort } @@ -307,7 +307,7 @@ $(document).ready(function(){ ${streamType.itemValue} - ${fns:abbr(log.capIp, 42)} + ${log.addrList } ${log.serverLocate} ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp index 3350326b4..c53cfbc74 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp @@ -173,12 +173,7 @@ $(document).ready(function(){ - - - - - - + @@ -188,7 +183,13 @@ $(document).ready(function(){ - + + + + + + + @@ -196,7 +197,7 @@ $(document).ready(function(){ - + @@ -224,22 +225,7 @@ $(document).ready(function(){ ${log.foundTime } ${log.recvTime } - - - - - - - - - - - - - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} - ${log.dPort } - ${log.sPort } + @@ -283,8 +269,23 @@ $(document).ready(function(){ ${log.protocol} - - + ${fns:abbr(log.capIp, 42)} + + + + + + + + + + + + + ${fns:abbr(log.dIp, 42)} + ${fns:abbr(log.sIp, 42)} + ${log.dPort } + ${log.sPort } @@ -308,7 +309,7 @@ $(document).ready(function(){ ${streamType.itemValue} - ${fns:abbr(log.capIp, 42)} + ${log.addrList } ${log.serverLocate} ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp index 93bb0c4c2..513ff5aa3 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp @@ -172,14 +172,8 @@ $(document).ready(function(){ - - - - - - - + @@ -187,7 +181,13 @@ $(document).ready(function(){ - + + + + + + + @@ -195,7 +195,7 @@ $(document).ready(function(){ - + @@ -223,22 +223,7 @@ $(document).ready(function(){ ${log.foundTime } ${log.recvTime } - - - - - - - - - - - - - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} - ${log.dPort } - ${log.sPort } + @@ -282,8 +267,23 @@ $(document).ready(function(){ ${log.protocol} - - + ${fns:abbr(log.capIp, 42)} + + + + + + + + + + + + + ${fns:abbr(log.dIp, 42)} + ${fns:abbr(log.sIp, 42)} + ${log.dPort } + ${log.sPort } @@ -307,7 +307,7 @@ $(document).ready(function(){ ${streamType.itemValue} - ${fns:abbr(log.capIp, 42)} + ${log.addrList } ${log.serverLocate} ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp index 78d43b890..8275a3ff1 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp @@ -169,12 +169,7 @@ $(document).ready(function(){ - - - - - - + @@ -184,6 +179,13 @@ $(document).ready(function(){ + + + + + + + @@ -192,7 +194,7 @@ $(document).ready(function(){ - + @@ -220,22 +222,7 @@ $(document).ready(function(){ ${log.foundTime } ${log.recvTime } - - - - - - - - - - - - - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} - ${log.dPort } - ${log.sPort } + @@ -279,8 +266,23 @@ $(document).ready(function(){ ${log.protocol} - - + ${fns:abbr(log.capIp, 42)} + + + + + + + + + + + + + ${fns:abbr(log.dIp, 42)} + ${fns:abbr(log.sIp, 42)} + ${log.dPort } + ${log.sPort } @@ -304,7 +306,7 @@ $(document).ready(function(){ ${streamType.itemValue} - ${fns:abbr(log.capIp, 42)} + ${log.addrList } ${log.serverLocate} ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp index a5e809109..9652f21e4 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp @@ -172,12 +172,7 @@ $(document).ready(function(){ - - - - - - + @@ -187,7 +182,13 @@ $(document).ready(function(){ - + + + + + + + @@ -195,7 +196,7 @@ $(document).ready(function(){ - + @@ -223,22 +224,7 @@ $(document).ready(function(){ ${log.foundTime } ${log.recvTime } - - - - - - - - - - - - - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} - ${log.dPort } - ${log.sPort } + @@ -282,8 +268,23 @@ $(document).ready(function(){ ${log.protocol} - - + ${fns:abbr(log.capIp, 42)} + + + + + + + + + + + + + ${fns:abbr(log.dIp, 42)} + ${fns:abbr(log.sIp, 42)} + ${log.dPort } + ${log.sPort } @@ -307,7 +308,7 @@ $(document).ready(function(){ ${streamType.itemValue} - ${fns:abbr(log.capIp, 42)} + ${log.addrList } ${log.serverLocate} ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp index 39d2ee0a8..39b38ec80 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp @@ -172,12 +172,7 @@ $(document).ready(function(){ - - - - - - + @@ -187,7 +182,13 @@ $(document).ready(function(){ - + + + + + + + @@ -195,7 +196,7 @@ $(document).ready(function(){ - + @@ -223,22 +224,7 @@ $(document).ready(function(){ ${log.foundTime } ${log.recvTime } - - - - - - - - - - - - - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} - ${log.dPort } - ${log.sPort } + @@ -282,8 +268,23 @@ $(document).ready(function(){ ${log.protocol} - - + ${fns:abbr(log.capIp, 42)} + + + + + + + + + + + + + ${fns:abbr(log.dIp, 42)} + ${fns:abbr(log.sIp, 42)} + ${log.dPort } + ${log.sPort } @@ -307,7 +308,7 @@ $(document).ready(function(){ ${streamType.itemValue} - ${fns:abbr(log.capIp, 42)} + ${log.addrList } ${log.serverLocate} ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp index bc0f43bd4..3c0e1a125 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp @@ -229,12 +229,7 @@ - - - - - - + @@ -245,6 +240,13 @@ + + + + + + + @@ -252,7 +254,7 @@ - + @@ -280,22 +282,7 @@ ${log.foundTime } ${log.recvTime } - - - - - - - - - - - - - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} - ${log.dPort } - ${log.sPort } + @@ -339,8 +326,23 @@ ${log.protocol} - - + ${fns:abbr(log.capIp, 42)} + + + + + + + + + + + + + ${fns:abbr(log.dIp, 42)} + ${fns:abbr(log.sIp, 42)} + ${log.dPort } + ${log.sPort } @@ -364,7 +366,7 @@ ${streamType.itemValue} - ${fns:abbr(log.capIp, 42)} + ${log.addrList } ${log.serverLocate} ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp index 0cbef684a..a2d05dc89 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp @@ -172,12 +172,7 @@ $(document).ready(function(){ - - - - - - + @@ -187,7 +182,13 @@ $(document).ready(function(){ - + + + + + + + @@ -195,7 +196,7 @@ $(document).ready(function(){ - + @@ -223,22 +224,7 @@ $(document).ready(function(){ ${log.foundTime } ${log.recvTime } - - - - - - - - - - - - - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} - ${log.dPort } - ${log.sPort } + @@ -282,8 +268,23 @@ $(document).ready(function(){ ${log.protocol} - - + ${fns:abbr(log.capIp, 42)} + + + + + + + + + + + + + ${fns:abbr(log.dIp, 42)} + ${fns:abbr(log.sIp, 42)} + ${log.dPort } + ${log.sPort } @@ -307,7 +308,7 @@ $(document).ready(function(){ ${streamType.itemValue} - ${fns:abbr(log.capIp, 42)} + ${log.addrList } ${log.serverLocate} ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp index 8fe076794..2fc0fee4e 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp @@ -172,12 +172,7 @@ $(document).ready(function(){ - - - - - - + @@ -187,7 +182,13 @@ $(document).ready(function(){ - + + + + + + + @@ -195,7 +196,7 @@ $(document).ready(function(){ - + @@ -223,22 +224,7 @@ $(document).ready(function(){ ${log.foundTime } ${log.recvTime } - - - - - - - - - - - - - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} - ${log.dPort } - ${log.sPort } + @@ -282,8 +268,23 @@ $(document).ready(function(){ ${log.protocol} - - + ${fns:abbr(log.capIp, 42)} + + + + + + + + + + + + + ${fns:abbr(log.dIp, 42)} + ${fns:abbr(log.sIp, 42)} + ${log.dPort } + ${log.sPort } @@ -307,7 +308,7 @@ $(document).ready(function(){ ${streamType.itemValue} - ${fns:abbr(log.capIp, 42)} + ${log.addrList } ${log.serverLocate} ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp index 3c58bf1c6..5d3239cc3 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp @@ -171,12 +171,7 @@ $(document).ready(function(){ - - - - - - + @@ -186,7 +181,13 @@ $(document).ready(function(){ - + + + + + + + @@ -194,7 +195,7 @@ $(document).ready(function(){ - + @@ -222,22 +223,7 @@ $(document).ready(function(){ ${log.foundTime } ${log.recvTime } - - - - - - - - - - - - - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} - ${log.dPort } - ${log.sPort } + @@ -281,8 +267,23 @@ $(document).ready(function(){ ${log.protocol} - - + ${fns:abbr(log.capIp, 42)} + + + + + + + + + + + + + ${fns:abbr(log.dIp, 42)} + ${fns:abbr(log.sIp, 42)} + ${log.dPort } + ${log.sPort } @@ -306,7 +307,7 @@ $(document).ready(function(){ ${streamType.itemValue} - ${fns:abbr(log.capIp, 42)} + ${log.addrList } ${log.serverLocate} ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp index a1f08a1c2..759bd815a 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp @@ -172,12 +172,7 @@ $(document).ready(function(){ - - - - - - + @@ -187,7 +182,13 @@ $(document).ready(function(){ - + + + + + + + @@ -195,7 +196,7 @@ $(document).ready(function(){ - + @@ -223,22 +224,7 @@ $(document).ready(function(){ ${log.foundTime } ${log.recvTime } - - - - - - - - - - - - - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} - ${log.dPort } - ${log.sPort } + @@ -282,8 +268,23 @@ $(document).ready(function(){ ${log.protocol} - - + ${fns:abbr(log.capIp, 42)} + + + + + + + + + + + + + ${fns:abbr(log.dIp, 42)} + ${fns:abbr(log.sIp, 42)} + ${log.dPort } + ${log.sPort } @@ -307,7 +308,7 @@ $(document).ready(function(){ ${streamType.itemValue} - ${fns:abbr(log.capIp, 42)} + ${log.addrList } ${log.serverLocate} ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp index 4526521c9..7c9acc838 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp @@ -172,12 +172,7 @@ $(document).ready(function(){ - - - - - - + @@ -187,7 +182,13 @@ $(document).ready(function(){ - + + + + + + + @@ -195,7 +196,7 @@ $(document).ready(function(){ - + @@ -223,22 +224,7 @@ $(document).ready(function(){ ${log.foundTime } ${log.recvTime } - - - - - - - - - - - - - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} - ${log.dPort } - ${log.sPort } + @@ -282,8 +268,23 @@ $(document).ready(function(){ ${log.protocol} - - + ${fns:abbr(log.capIp, 42)} + + + + + + + + + + + + + ${fns:abbr(log.dIp, 42)} + ${fns:abbr(log.sIp, 42)} + ${log.dPort } + ${log.sPort } @@ -307,7 +308,7 @@ $(document).ready(function(){ ${streamType.itemValue} - ${fns:abbr(log.capIp, 42)} + ${log.addrList } ${log.serverLocate} ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp index dc169b62b..1b38e6e7a 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp @@ -172,12 +172,6 @@ $(document).ready(function(){ - - - - - - @@ -194,8 +188,13 @@ $(document).ready(function(){ - - + + + + + + + @@ -203,7 +202,7 @@ $(document).ready(function(){ - + @@ -231,22 +230,7 @@ $(document).ready(function(){ ${log.foundTime } ${log.recvTime } - - - - - - - - - - - - - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} - ${log.dPort } - ${log.sPort } + @@ -287,7 +271,23 @@ $(document).ready(function(){ - + ${fns:abbr(log.capIp, 42)} + + + + + + + + + + + + + ${fns:abbr(log.dIp, 42)} + ${fns:abbr(log.sIp, 42)} + ${log.dPort } + ${log.sPort } @@ -311,7 +311,7 @@ $(document).ready(function(){ ${streamType.itemValue} - ${fns:abbr(log.capIp, 42)} + ${log.addrList } ${log.serverLocate} ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp index 3b1d58a0e..304fb69e5 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp @@ -172,12 +172,7 @@ $(document).ready(function(){ - - - - - - + @@ -194,8 +189,13 @@ $(document).ready(function(){ - - + + + + + + + @@ -203,7 +203,7 @@ $(document).ready(function(){ - + @@ -231,22 +231,7 @@ $(document).ready(function(){ ${log.foundTime } ${log.recvTime } - - - - - - - - - - - - - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} - ${log.dPort } - ${log.sPort } + @@ -287,7 +272,23 @@ $(document).ready(function(){ - + ${fns:abbr(log.capIp, 42)} + + + + + + + + + + + + + ${fns:abbr(log.dIp, 42)} + ${fns:abbr(log.sIp, 42)} + ${log.dPort } + ${log.sPort } @@ -311,7 +312,7 @@ $(document).ready(function(){ ${streamType.itemValue} - ${fns:abbr(log.capIp, 42)} + ${log.addrList } ${log.serverLocate} ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp index 011dbf5a9..e8e9d6ccb 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp @@ -172,12 +172,7 @@ $(document).ready(function(){ - - - - - - + @@ -195,7 +190,13 @@ $(document).ready(function(){ - + + + + + + + @@ -203,7 +204,7 @@ $(document).ready(function(){ - + @@ -231,22 +232,7 @@ $(document).ready(function(){ ${log.foundTime } ${log.recvTime } - - - - - - - - - - - - - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} - ${log.dPort } - ${log.sPort } + @@ -287,7 +273,23 @@ $(document).ready(function(){ - + ${fns:abbr(log.capIp, 42)} + + + + + + + + + + + + + ${fns:abbr(log.dIp, 42)} + ${fns:abbr(log.sIp, 42)} + ${log.dPort } + ${log.sPort } @@ -311,7 +313,6 @@ $(document).ready(function(){ ${streamType.itemValue} - ${fns:abbr(log.capIp, 42)} ${log.addrList } ${log.serverLocate} ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp index d4ff2ed35..88cddbb0a 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp @@ -172,15 +172,17 @@ $(document).ready(function(){ + + + + + - - - @@ -188,7 +190,7 @@ $(document).ready(function(){ - + @@ -216,22 +218,7 @@ $(document).ready(function(){ ${log.foundTime } ${log.recvTime } - - - - - - - - - - - - - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} - ${log.dPort } - ${log.sPort } + @@ -248,6 +235,24 @@ $(document).ready(function(){ ${log.protocol} + + ${fns:abbr(log.capIp, 42)} + + + + + + + + + + + + + ${fns:abbr(log.dIp, 42)} + ${fns:abbr(log.sIp, 42)} + ${log.dPort } + ${log.sPort } @@ -271,7 +276,7 @@ $(document).ready(function(){ ${streamType.itemValue} - ${fns:abbr(log.capIp, 42)} + ${log.addrList } ${log.serverLocate} ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp index f5be2f338..ae45dcf59 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp @@ -174,20 +174,20 @@ $(document).ready(function(){ - - - - - - - <%-- --%> + - + + + + + + + @@ -195,7 +195,7 @@ $(document).ready(function(){ - + @@ -223,23 +223,7 @@ $(document).ready(function(){ ${log.foundTime } ${log.recvTime } - - - - - - - - - - - - - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} - ${log.dPort } - ${log.sPort } - <%-- ${log.service } --%> + @@ -259,6 +243,23 @@ $(document).ready(function(){ TCP UDP + ${fns:abbr(log.capIp, 42)} + + + + + + + + + + + + + ${fns:abbr(log.dIp, 42)} + ${fns:abbr(log.sIp, 42)} + ${log.dPort } + ${log.sPort } @@ -282,7 +283,7 @@ $(document).ready(function(){ ${streamType.itemValue} - ${fns:abbr(log.capIp, 42)} + ${log.addrList } ${log.serverLocate} ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp index dfa061a07..ec8a4de27 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp @@ -189,18 +189,19 @@ + + + + + + + - - - - - - @@ -208,7 +209,7 @@ - + @@ -236,6 +237,19 @@ ${log.foundTime } ${log.recvTime } + + + + + + + + + + ${log.p2pProto} + ${log.p2pFileId} + ${log.p2pKeyword} + ${fns:abbr(log.capIp, 42)} @@ -252,18 +266,6 @@ ${fns:abbr(log.sIp, 42)} ${log.dPort } ${log.sPort } - - - - - - - - - ${log.p2pProto} - ${log.p2pFileId} - ${log.p2pKeyword} - @@ -287,7 +289,7 @@ ${streamType.itemValue} - ${fns:abbr(log.capIp, 42)} + ${log.addrList } ${log.serverLocate} ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp index 8e875ef0f..1d612695e 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp @@ -171,17 +171,18 @@ + + + + + + - - - - - @@ -189,7 +190,7 @@ - + @@ -217,22 +218,7 @@ ${log.foundTime } ${log.recvTime } - - - - - - - - - - - - - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} - ${log.dPort } - ${log.sPort } + @@ -249,6 +235,23 @@ PAPCHAP MS-CHAP(v1/v2)EAP-TLS + ${fns:abbr(log.capIp, 42)} + + + + + + + + + + + + + ${fns:abbr(log.dIp, 42)} + ${fns:abbr(log.sIp, 42)} + ${log.dPort } + ${log.sPort } @@ -272,7 +275,7 @@ ${streamType.itemValue} - ${fns:abbr(log.capIp, 42)} + ${log.addrList } ${log.serverLocate} ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp index 2fdce75f7..9685d8ffb 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp @@ -174,13 +174,7 @@ $(document).ready(function(){ - - - - - - - <%-- --%> + @@ -189,7 +183,13 @@ $(document).ready(function(){ - + + + + + + + @@ -197,7 +197,7 @@ $(document).ready(function(){ - + @@ -225,23 +225,6 @@ $(document).ready(function(){ ${log.foundTime } ${log.recvTime } - - - - - - - - - - - - - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} - ${log.dPort } - ${log.sPort } - <%-- ${log.service } --%> @@ -259,6 +242,23 @@ $(document).ready(function(){ SSHD SFTP + ${fns:abbr(log.capIp, 42)} + + + + + + + + + + + + + ${fns:abbr(log.dIp, 42)} + ${fns:abbr(log.sIp, 42)} + ${log.dPort } + ${log.sPort } @@ -282,7 +282,7 @@ $(document).ready(function(){ ${streamType.itemValue} - ${fns:abbr(log.capIp, 42)} + ${log.addrList } ${log.serverLocate} ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp index 2ac24ca46..1a675c09f 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp @@ -180,19 +180,20 @@ - - - - - - + SNI SAN CN - + + + + + + + @@ -200,7 +201,7 @@ - + @@ -228,6 +229,20 @@ ${log.foundTime } ${log.recvTime } + + + + + + + + + + ${log.version } + ${log.sni } + ${log.san } + ${log.cn } + ${fns:abbr(log.capIp, 42)} @@ -244,19 +259,6 @@ ${fns:abbr(log.sIp, 42)} ${log.dPort } ${log.sPort } - - - - - - - - - ${log.version } - ${log.sni } - ${log.san } - ${log.cn } - @@ -280,7 +282,7 @@ ${streamType.itemValue} - ${fns:abbr(log.capIp, 42)} + ${log.addrList } ${log.serverLocate} ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp index c60ce688f..dcf18bc5f 100644 --- a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp @@ -159,12 +159,7 @@ - - - - - - + URL         @@ -182,6 +177,13 @@ --%> + + + + + + + @@ -189,7 +191,7 @@ - + @@ -217,22 +219,7 @@ ${log.foundTime } ${log.recvTime } - - - - - - - - - - - - - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} - ${log.dPort } - ${log.sPort } + @@ -261,6 +248,24 @@ ${log.reqHeader } ${log.respHeader } ${log.website } + + ${fns:abbr(log.capIp, 42)} + + + + + + + + + + + + + ${fns:abbr(log.dIp, 42)} + ${fns:abbr(log.sIp, 42)} + ${log.dPort } + ${log.sPort } @@ -284,7 +289,7 @@ ${streamType.itemValue} - ${fns:abbr(log.capIp, 42)} + ${log.addrList } ${log.serverLocate} ${log.clientLocate}