fix for v6 peering matrix

inex · Jun 11, 2021 · 418b4ff · 418b4ff
1 parent 80c3986
commit 418b4ff
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/database/Repositories/BGPSessionData.php b/database/Repositories/BGPSessionData.php
@@ -107,8 +107,8 @@ public function getPeers( $vlan = null, $protocol = 6, $asn = null, $forceDb = f
  FROM bgpsessiondata AS bs
  LEFT JOIN ipv{$protocol}address AS srcip ON bs.srcipaddressid = srcip.id
  LEFT JOIN ipv{$protocol}address AS dstip ON bs.dstipaddressid = dstip.id
- LEFT JOIN vlaninterface AS vlis ON srcip.id = vlis.ipv4addressid
- LEFT JOIN vlaninterface AS vlid ON dstip.id = vlid.ipv4addressid
+ LEFT JOIN vlaninterface AS vlis ON srcip.id = vlis.ipv{$protocol}addressid
+ LEFT JOIN vlaninterface AS vlid ON dstip.id = vlid.ipv{$protocol}addressid
  LEFT JOIN virtualinterface AS vis ON vlis.virtualinterfaceid = vis.id
  LEFT JOIN virtualinterface AS vid ON vlid.virtualinterfaceid = vid.id
  LEFT JOIN cust AS cs ON vis.custid = cs.id

diff --git a/database/Repositories/BgpSession.php b/database/Repositories/BgpSession.php
@@ -125,8 +125,8 @@ public function getPeers( $vlan = null, $protocol = 6, $asn = null, $forceDb = f
  FROM bgp_sessions AS bs
  LEFT JOIN ipv{$protocol}address AS srcip ON bs.srcipaddressid = srcip.id
  LEFT JOIN ipv{$protocol}address AS dstip ON bs.dstipaddressid = dstip.id
- LEFT JOIN vlaninterface AS vlis ON srcip.id = vlis.ipv4addressid
- LEFT JOIN vlaninterface AS vlid ON dstip.id = vlid.ipv4addressid
+ LEFT JOIN vlaninterface AS vlis ON srcip.id = vlis.ipv{$protocol}addressid
+ LEFT JOIN vlaninterface AS vlid ON dstip.id = vlid.ipv{$protocol}addressid
  LEFT JOIN virtualinterface AS vis ON vlis.virtualinterfaceid = vis.id
  LEFT JOIN virtualinterface AS vid ON vlid.virtualinterfaceid = vid.id
  LEFT JOIN cust AS cs ON vis.custid = cs.id