Revision 9c5ad167
Added by Seth Mos over 14 years ago
| etc/inc/rrd.inc | ||
|---|---|---|
| 332 | 332 |
|
| 333 | 333 |
$rrdupdatesh .= "\n"; |
| 334 | 334 |
$rrdupdatesh .= "# polling packets for interface $ifname $realif \n"; |
| 335 |
<<<<<<< HEAD |
|
| 336 | 335 |
$rrdupdatesh .= "$rrdtool update $rrddbpath$ifname$packets N:\\\n"; |
| 337 | 336 |
$rrdupdatesh .= "`$pfctl -vvsI -i {$realif} | awk '/In4\/Pass|Out4\/Pass|In6\/Pass|Out6\/Pass|In4\/Block|Out4\/Block|In6\/Block|Out6\/Block/ {printf \$4 \":\"}'|sed -e 's/.\$//'`\n";
|
| 338 |
======= |
|
| 339 |
$rrdupdatesh .= "unset PACKETS \n"; |
|
| 340 |
$rrdupdatesh .= "PACKETS=`cat \$TMPFILE | awk '/In4\/Pass|Out4\/Pass/ {printf \$4 \":\"}'`\\\n";
|
|
| 341 |
$rrdupdatesh .= "`cat \$TMPFILE | awk '/In4\/Block|Out4\/Block/ {printf \$4 \":\"}'|sed -e 's/.\$//'`\n";
|
|
| 342 |
$rrdupdatesh .= "$rrdtool update $rrddbpath$ifname$packets N:\$PACKETS\n"; |
|
| 343 |
$rrdupdatesh .= "rm \$TMPFILE \n"; |
|
| 344 |
>>>>>>> upstream/master |
|
| 345 | 337 |
|
| 346 | 338 |
/* WIRELESS, set up the rrd file */ |
| 347 | 339 |
if($config['interfaces'][$ifname]['wireless']['mode'] == "bss") {
|
Also available in: Unified diff
unbreak the broken merge