Adds note to listed application protocols

Fixes #1377
This commit is contained in:
Simone Mainardi 2017-08-01 14:36:48 +02:00
parent 2dce680ba8
commit c3ab472cfb
3 changed files with 21 additions and 1 deletions

View file

@ -128,6 +128,8 @@ local en = {
top_receivers = "Top Receivers",
top_profiles = "Top Profiles",
all_protocols = "All Protocols",
note_click_to_zoom = "Left-click on the chart to zoom in, right-click to zoom out.",
note_protocols_shown = "Protocols not seen in the selected timeframe are not listed in the dropdown.",
},
flows_page = {

View file

@ -820,6 +820,24 @@ elseif(page == "historical") then
if(rrd_file == nil) then rrd_file = "bytes.rrd" end
drawRRD(ifstats.id, nil, rrd_file, _GET["zoom"], url.."&page=historical", 1, _GET["epoch"], selected_epoch, topArray)
--drawRRD(ifstats.id, nil, rrd_file, _GET["zoom"], url.."&page=historical", 1, _GET["epoch"], selected_epoch, topArray, _GET["comparison_period"])
if ntop.isPro() then
print[[
<br>
<div>
<b>]] print(i18n('notes')) print[[</b>
<ul>
<li>]] print(i18n('graphs.note_click_to_zoom')) print[[</li>
<li>]] print(i18n('graphs.note_protocols_shown')) print[[</li>
</ul>
</div>
]]
end
elseif(page == "trafficprofiles") then
print("<table class=\"table table-striped table-bordered\">\n")
print("<tr><th width=15%><a href=\""..ntop.getHttpPrefix().."/lua/pro/admin/edit_profiles.lua\">" .. i18n("traffic_profiles.profile_name") .. "</A></th><th width=5%>" .. i18n("chart") .. "</th><th>" .. i18n("traffic") .. "</th></tr>\n")

View file

@ -67,7 +67,7 @@ static void* divertPacketPollLoop(void* ptr) {
#else
h.len = h.caplen = len, gettimeofday(&h.ts, NULL);
#endif /* __OpenBSD__ */
iface->dissectPacket(0, &h, packet, &c, &srcHost, &dstHost, &flow);
iface->dissectPacket(0, NULL, &h, packet, &c, &srcHost, &dstHost, &flow);
/* Enable the row below to specify the firewall rule corresponding to the protocol */
#if 0