From fe0430f761e333db547d62a374f280b8f12d0c79 Mon Sep 17 00:00:00 2001
From: Ermal <eri@pfsense.org>
Date: Tue, 9 Sep 2014 23:55:43 +0200
Subject: Put some more statistics and the user that gets connected now that we
 can

---
 usr/local/www/diag_ipsec.php | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

(limited to 'usr/local/www/diag_ipsec.php')

diff --git a/usr/local/www/diag_ipsec.php b/usr/local/www/diag_ipsec.php
index 70d9783..76b3089 100644
--- a/usr/local/www/diag_ipsec.php
+++ b/usr/local/www/diag_ipsec.php
@@ -106,6 +106,7 @@ $status = ipsec_smp_dump_status();
 				<th class="listhdrr nowrap"><?php echo gettext("Remote ID");?></th>
 				<th class="listhdrr nowrap"><?php echo gettext("Remote IP");?></th>
 				<th class="listhdrr nowrap"><?php echo gettext("Role");?></th>
+				<th class="listhdrr nowrap"><?php echo gettext("Reauth");?></th>
 				<th class="listhdrr nowrap"><?php echo gettext("Status");?></th>
 				<td class="list nowrap"></td>
 		</tr>
@@ -168,6 +169,10 @@ $status = ipsec_smp_dump_status();
 							echo htmlspecialchars($ikesa['remote']['identification']);
 					} else
 						echo 'Unknown';
+
+					if (is_array($ikesa['remote']['auth']) && !empty($ikesa['remote']['auth']['identity'])) {
+						echo "<br/> {$ikesa['remote']['auth']['identity']}";
+					}
 				}
 			?>
 				</td>
@@ -188,6 +193,9 @@ $status = ipsec_smp_dump_status();
 					<?php echo htmlspecialchars($ikesa['role']);?>
 				</td>
 				<td class="listr">
+					<?php echo htmlspecialchars($ikesa['reauth']);?>
+				</td>
+				<td class="listr">
 					<center>
 						<img src ="/themes/<?php echo $g['theme']; ?>/images/icons/icon_<?php echo $icon; ?>.gif" title="<?php echo $ikesa['status']; ?>" alt=""/>
 						<br/><?php echo htmlspecialchars($ikesa['status']);?>
@@ -215,7 +223,7 @@ $status = ipsec_smp_dump_status();
 			</tr>
 			<?php if (is_array($ikesa['childsalist'])): ?>
 			<tr>
-				<td class="listrborder" colspan="7">
+				<td class="listrborder" colspan="8">
 				<div id="btnchildsa-<?=$ikeid;?>">
 					<input  type="button" onclick="show_childsa('childsa-<?=$ikeid;?>','btnchildsa-<?=$ikeid;?>');" value="+" /> - Show child SA entries
 				</div>
@@ -226,6 +234,9 @@ $status = ipsec_smp_dump_status();
 						<th class="listhdrr nowrap"><?php echo gettext("Local SPI");?></th>
 						<th class="listhdrr nowrap"><?php echo gettext("Remote SPI");?></th>
 						<th class="listhdrr nowrap"><?php echo gettext("Remote subnets");?></th>
+						<th class="listhdrr nowrap"><?php echo gettext("Rekey");?></th>
+						<th class="listhdrr nowrap"><?php echo gettext("Algo");?></th>
+						<th class="listhdrr nowrap"><?php echo gettext("Stats");?></th>
 					</tr>
 				</thead>
 				<tbody>
@@ -262,6 +273,28 @@ $status = ipsec_smp_dump_status();
 						echo "Unknown";
 				?>
 						</td>
+						<td class="listr nowrap">
+							<?php echo htmlspecialchars($childsa['rekey']); ?>
+						</td>
+						<td class="listr nowrap">
+						<?php
+							echo htmlspecialchars($childsa['encalg']);
+							echo "<br/>";
+							echo htmlspecialchars($childsa['intalg']);
+							echo "<br/>";
+							if (!empty($childsa['esn']))
+								echo htmlspecialchars($childsa['rekey']);
+						?>
+						</td>
+						<td class="listr nowrap">
+						<?php
+							echo "IPComp: " . htmlspecialchars($childsa['ipcomp']);
+							echo "<br/>";
+							echo "Bytes-In: " . htmlspecialchars($childsa['bytesin']) . "/Packets-In: " . htmlspecialchars($childsa['packetsin']);;
+							echo "<br/>";
+							echo "Bytes-Out: " . htmlspecialchars($childsa['bytesout']) . "/Packets-Out: " . htmlspecialchars($childsa['packetsout']);;
+						?>
+						</td>
 						<td class="list nowrap">
 							&nbsp;
 						</td>
-- 
cgit v1.1