feat(bgp): simplify BGP UI, remove legacy FRR fields, and install blackhole distance 255 routes for advertised networks

internal/dynamicrouting/bgp_test.go

@@ -0,0 +1,53 @@
+package dynamicrouting
+
+import (
+	"strings"
+	"testing"
+)
+
+func TestBGPConfigGeneration(t *testing.T) {
+	m := &Manager{}
+	m.config.BGPInstance = BGPInstance{
+		Enabled:            true,
+		AS:                 65001,
+		RouterID:           "192.168.131.56",
+		RedistributeStatic: true,
+	}
+	m.config.BGPNetworks = []BGPNetwork{
+		{
+			ID:       "net-1",
+			Network:  "192.168.100.0/24",
+			Disabled: false,
+		},
+	}
+	m.config.BGPPeers = []BGPPeer{
+		{
+			ID:             "peer-1",
+			Name:           "TestPeer",
+			RemoteAddress:  "192.168.129.225",
+			RemoteAS:       65555,
+			Passive:        true,
+			NexthopSelf:    true,
+			RedistStatic:   true,
+			OutputNetworks: []string{"192.168.200.0/24"},
+		},
+	}
+
+	// Mock bird and birdc
+	dir := t.TempDir()
+	t.Setenv("PATH", dir+":"+dir)
+
+	// Test configuration generation
+	sb := &strings.Builder{}
+	// Test the export filter logic directly
+	exportSources := []string{`source = RTS_BGP`}
+	if m.config.BGPPeers[0].RedistStatic || m.config.BGPInstance.RedistributeStatic {
+		exportSources = append(exportSources, `source ~ [ RTS_STATIC, RTS_INHERIT ]`)
+	}
+	exportRule := strings.Join(exportSources, ") || (")
+	if !strings.Contains(exportRule, "RTS_INHERIT") {
+		t.Fatalf("Expected exportRule to contain RTS_INHERIT for kernel static routes, got %s", exportRule)
+	}
+
+	_ = sb
+}

internal/dynamicrouting/manager.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"log"
+	"net"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -230,6 +231,9 @@ func (m *Manager) applyBirdConfig() error {
 	sb.WriteString("            if source = RTS_RIP then {\n")
 	sb.WriteString("                krt_metric = 120;\n")
 	sb.WriteString("            }\n")
+	sb.WriteString("            if source ~ [ RTS_STATIC, RTS_INHERIT ] then {\n")
+	sb.WriteString("                krt_metric = 255;\n")
+	sb.WriteString("            }\n")
 	sb.WriteString("            accept;\n")
 	sb.WriteString("        };\n")
 	sb.WriteString("    };\n")
@@ -439,7 +443,7 @@ func (m *Manager) applyBirdConfig() error {
 					exportSources = append(exportSources, `source = RTS_DEVICE`)
 				}
 				if peer.RedistStatic || m.config.BGPInstance.RedistributeStatic {
-					exportSources = append(exportSources, `source = RTS_STATIC`)
+					exportSources = append(exportSources, `source ~ [ RTS_STATIC, RTS_INHERIT ]`)
 				}
 				if peer.RedistOSPF || m.config.BGPInstance.RedistributeOSPF {
 					exportSources = append(exportSources, `source = RTS_OSPF`)
@@ -490,7 +494,7 @@ func (m *Manager) applyBirdConfig() error {
 		sb.WriteString("        import filter { krt_metric = 110; accept; };\n")
 
 		var ospfExports []string
-		ospfExports = append(ospfExports, "RTS_STATIC")
+		ospfExports = append(ospfExports, "RTS_STATIC", "RTS_INHERIT")
 		if inst.RedistributeConnected || m.config.OSPFInstance.RedistributeConnected {
 			ospfExports = append(ospfExports, "RTS_DEVICE")
 		}
@@ -667,6 +671,9 @@ func (m *Manager) applyBirdConfig() error {
 		return fmt.Errorf("BIRD reload failed: %s: %w", string(reloadOut), reloadErr)
 	}
 
+	// Synchronize kernel blackhole routes (distance 255) for all active advertised prefixes
+	m.syncKernelBlackholeRoutes()
+
 	return nil
 }
 
@@ -674,6 +681,95 @@ func birdcExec(cmd string) ([]byte, error) {
 	return exec.Command("birdc", cmd).CombinedOutput()
 }
 
+// syncKernelBlackholeRoutes ensures all BGP advertised networks (global BGP networks and peer OutputNetworks)
+// have corresponding blackhole routes with metric 255 installed in the Linux kernel routing table.
+// This guarantees that BGP can announce these prefixes reliably into the RIB/FIB, while ensuring any active
+// connected/local routes take precedence (metric 0 < metric 255) and prevents routing loops if subnets are incomplete.
+func (m *Manager) syncKernelBlackholeRoutes() {
+	desired := make(map[string]bool)
+	if m.config.BGPInstance.Enabled {
+		for _, n := range m.config.BGPNetworks {
+			cidr := strings.TrimSpace(n.Network)
+			if !n.Disabled && cidr != "" {
+				if _, _, err := net.ParseCIDR(cidr); err == nil {
+					desired[cidr] = true
+				}
+			}
+		}
+		for _, p := range m.config.BGPPeers {
+			if p.Disabled {
+				continue
+			}
+			for _, on := range p.OutputNetworks {
+				cidr := strings.TrimSpace(on)
+				if cidr != "" {
+					if _, _, err := net.ParseCIDR(cidr); err == nil {
+						desired[cidr] = true
+					}
+				}
+			}
+		}
+	}
+
+	// Query existing kernel blackhole routes with metric 255
+	out, err := exec.Command("ip", "route", "show", "type", "blackhole").Output()
+	existing := make(map[string]bool)
+	if err == nil {
+		lines := strings.Split(string(out), "\n")
+		for _, line := range lines {
+			line = strings.TrimSpace(line)
+			if line == "" {
+				continue
+			}
+			parts := strings.Fields(line)
+			if len(parts) >= 2 && parts[0] == "blackhole" {
+				dst := parts[1]
+				if strings.Contains(line, "metric 255") {
+					existing[dst] = true
+				}
+			}
+		}
+	}
+
+	// Install desired blackhole routes with metric 255 proto static
+	for cidr := range desired {
+		if !existing[cidr] {
+			cmd := exec.Command("ip", "route", "replace", "blackhole", cidr, "metric", "255", "proto", "static")
+			if out, err := cmd.CombinedOutput(); err != nil {
+				log.Printf("[DynamicRouting] Warning: failed to install kernel blackhole route %s: %s (%v)", cidr, string(out), err)
+			} else {
+				log.Printf("[DynamicRouting] Installed kernel blackhole route %s with metric 255 (BGP advertised)", cidr)
+			}
+		}
+	}
+
+	// Cleanup any obsolete blackhole routes that were previously installed with metric 255
+	// Check static_routes.json first to ensure we don't delete user's manual static routes
+	userManualStaticBlackholes := make(map[string]bool)
+	if data, err := os.ReadFile("/etc/proxmox-router/routing/static_routes.json"); err == nil {
+		var userRoutes []struct {
+			DstAddress string `json:"dst_address"`
+			Gateway    string `json:"gateway"`
+			Action     string `json:"action"`
+			Disabled   bool   `json:"disabled"`
+		}
+		if json.Unmarshal(data, &userRoutes) == nil {
+			for _, ur := range userRoutes {
+				if !ur.Disabled && (strings.EqualFold(ur.Gateway, "blackhole") || strings.EqualFold(ur.Action, "blackhole")) {
+					userManualStaticBlackholes[strings.TrimSpace(ur.DstAddress)] = true
+				}
+			}
+		}
+	}
+
+	for cidr := range existing {
+		if !desired[cidr] && !userManualStaticBlackholes[cidr] {
+			_ = exec.Command("ip", "route", "del", "blackhole", cidr, "metric", "255").Run()
+			log.Printf("[DynamicRouting] Removed obsolete kernel blackhole route %s metric 255", cidr)
+		}
+	}
+}
+
 // -------------------------------------------------------------
 // BGP API & Operations (Multi-Instance BGP)
 // -------------------------------------------------------------

internal/routing/manager.go

@@ -416,6 +416,11 @@ func (m *RoutingManager) listLiveRoutesLocked() []RouteItem {
 			}
 
 			ifName := linkMap[r.LinkIndex]
+			act := "lookup"
+			if r.Type == 6 { // RTN_BLACKHOLE
+				gw = "blackhole"
+				act = "blackhole"
+			}
 
 			cleanDst := strings.ReplaceAll(dst, "/", "_")
 			cleanGw := gw
@@ -428,6 +433,7 @@ func (m *RoutingManager) listLiveRoutesLocked() []RouteItem {
 				ID:           routeID,
 				DstAddress:   dst,
 				Gateway:      gw,
+				Action:       act,
 				Interface:    ifName,
 				Distance:     r.Priority,
 				Protocol:     protoName,
@@ -797,26 +803,43 @@ func (m *RoutingManager) syncRouteGroupToKernel(dstAddress, routingTable string,
 		}
 		args = append(args, "proto", "static")
 		_ = exec.Command("ip", args...).Run()
+
+		// Also delete blackhole route variant if it existed
+		bhArgs := []string{"route", "del", "blackhole", normDst}
+		if distance > 0 {
+			bhArgs = append(bhArgs, "metric", strconv.Itoa(distance))
+		}
+		if tbl != "main" {
+			bhArgs = append(bhArgs, "table", tbl)
+		}
+		_ = exec.Command("ip", bhArgs...).Run()
 		return nil
 	}
 
 	if len(activeRoutes) == 1 {
 		r := activeRoutes[0]
-		args := []string{"route", "replace", normDst}
 		gw := strings.TrimSpace(r.Gateway)
-		if gw != "" {
-			if net.ParseIP(gw) != nil {
-				args = append(args, "via", gw)
-			} else {
-				args = append(args, "dev", gw)
+		isBlackhole := strings.EqualFold(gw, "blackhole") || strings.EqualFold(r.Action, "blackhole")
+
+		var args []string
+		if isBlackhole {
+			args = []string{"route", "replace", "blackhole", normDst}
+		} else {
+			args = []string{"route", "replace", normDst}
+			if gw != "" {
+				if net.ParseIP(gw) != nil {
+					args = append(args, "via", gw)
+				} else {
+					args = append(args, "dev", gw)
+				}
+			}
+			iface := strings.TrimSpace(r.Interface)
+			if iface != "" && gw != iface && (gw == "" || net.ParseIP(gw) != nil) {
+				args = append(args, "dev", iface)
+			}
+			if gw != "" && iface != "" && net.ParseIP(gw) != nil {
+				args = append(args, "onlink")
 			}
-		}
-		iface := strings.TrimSpace(r.Interface)
-		if iface != "" && gw != iface && (gw == "" || net.ParseIP(gw) != nil) {
-			args = append(args, "dev", iface)
-		}
-		if gw != "" && iface != "" && net.ParseIP(gw) != nil {
-			args = append(args, "onlink")
 		}
 		if distance > 0 {
 			args = append(args, "metric", strconv.Itoa(distance))

internal/routing/types.go

@@ -17,6 +17,7 @@ type RouteItem struct {
 	ECMP         bool   `json:"ecmp"`          // Equal-Cost Multi-Path route (MikroTik 'E' flag)
 	Multicast    bool   `json:"multicast"`     // Multicast / IGMP route (224.0.0.0/4 or kernel multicast)
 	IsMultiPath  bool   `json:"is_multipath"`  // Linux kernel multipath nexthop
+	Action       string `json:"action,omitempty"`      // "lookup", "blackhole", "unreachable"
 	Disabled     bool   `json:"disabled"`      // MikroTik 'X' flag
 	Comment      string `json:"comment,omitempty"`
 

internal/web/static/app.js

@@ -9641,6 +9641,11 @@ function renderBgpNetworks() {
           ? '<span class="px-2 py-0.5 rounded-full text-[10px] bg-slate-800 text-slate-400 border border-slate-700">Disabled</span>'
           : '<span class="px-2 py-0.5 rounded-full text-[10px] bg-emerald-500/10 text-emerald-400 border border-emerald-500/20">Announcing</span>'}
       </td>
+      <td class="py-2.5 px-3">
+        ${n.disabled
+          ? '<span class="text-slate-600 font-mono text-[10px]">-</span>'
+          : '<span class="px-2 py-0.5 rounded text-[10px] bg-slate-800 text-cyan-300 border border-cyan-800/40 font-mono">blackhole (dist 255)</span>'}
+      </td>
       <td class="py-2.5 px-3 text-slate-400 font-sans truncate max-w-xs">${escapeHtml(n.comment || '')}</td>
       <td class="py-2.5 px-3 text-right space-x-1 font-sans">
         <button onclick="deleteBgpNetwork('${n.id}')" class="px-2 py-1 rounded text-[11px] bg-rose-950/60 hover:bg-rose-900 text-rose-300 border border-rose-900/50">
@@ -10125,7 +10130,11 @@ async function submitBgpInstance(e) {
 
 // ----------------- BGP Peer Connection Modal (DebTik v7) -----------------
 function switchBgpPeerModalTab(tab) {
-  const tabs = ['general', 'extra', 'attributes', 'filter'];
+  // Normalize legacy tab names
+  if (tab === 'extra' || tab === 'filter') tab = 'filters';
+  if (tab === 'attributes') tab = 'networks';
+
+  const tabs = ['general', 'filters', 'networks'];
   tabs.forEach(t => {
     const pane = document.getElementById(`bgp-peer-tab-${t}`);
     const btn = document.getElementById(`bgp-peer-tab-btn-${t}`);
@@ -10145,7 +10154,7 @@ function addOutputNetworkRow(val = '') {
   const row = document.createElement('div');
   row.className = 'flex items-center gap-2 output-net-row';
   row.innerHTML = `
-    <input type="text" value="${escapeHtml(val)}" placeholder="e.g. 10.2.51.0/24 or BGP-AWMN" class="flex-1 bg-slate-900 border border-slate-700 rounded-lg px-3 py-1.5 text-white font-mono text-xs focus:outline-none focus:border-cyan-500">
+    <input type="text" value="${escapeHtml(val)}" placeholder="e.g. 192.168.100.0/24" class="flex-1 bg-slate-900 border border-slate-700 rounded-lg px-3 py-1.5 text-white font-mono text-xs focus:outline-none focus:border-cyan-500">
     <button type="button" onclick="this.closest('.output-net-row').remove()" class="w-7 h-7 flex items-center justify-center bg-slate-800 hover:bg-rose-950 text-slate-400 hover:text-rose-400 border border-slate-700 rounded-lg text-base font-bold transition" title="Remove network">-</button>
   `;
   container.appendChild(row);
@@ -10163,11 +10172,8 @@ function parseBgpTime(val) {
 }
 
 function formatBgpTime(secs) {
-  if (!secs || secs <= 0) return '00:00:00';
-  const h = Math.floor(secs / 3600);
-  const m = Math.floor((secs % 3600) / 60);
-  const s = secs % 60;
-  return `${String(h).padStart(2, '0')}:${String(m).padStart(2, '0')}:${String(s).padStart(2, '0')}`;
+  if (!secs || secs <= 0) return '30';
+  return String(secs);
 }
 
 function populateBgpRoutingTables() {
@@ -10189,82 +10195,36 @@ function populateBgpRoutingTables() {
 function openAddBgpPeerModal() {
   document.getElementById('bgp-peer-form').reset();
   document.getElementById('modal-bgp-peer-id').value = '';
-  document.getElementById('bgp-peer-modal-title').innerText = 'New...';
+  document.getElementById('bgp-peer-modal-title').innerText = 'New BGP Connection...';
   
   // General Tab
   document.getElementById('modal-bgp-peer-enabled').checked = true;
-  document.getElementById('modal-bgp-peer-comment').value = '';
   document.getElementById('modal-bgp-peer-name').value = '';
-  if (document.getElementById('modal-bgp-peer-instance')) document.getElementById('modal-bgp-peer-instance').value = 'bgp-instance-1';
-  if (document.getElementById('modal-bgp-peer-template')) document.getElementById('modal-bgp-peer-template').value = '';
-  document.getElementById('modal-bgp-peer-local-as').value = '';
-  document.getElementById('modal-bgp-peer-afi-ip').checked = true;
-  document.getElementById('modal-bgp-peer-afi-ipv6').checked = false;
-  if (document.getElementById('modal-bgp-peer-afi-l2vpn')) document.getElementById('modal-bgp-peer-afi-l2vpn').checked = false;
-  if (document.getElementById('modal-bgp-peer-afi-vpnv4')) document.getElementById('modal-bgp-peer-afi-vpnv4').checked = false;
-  if (document.getElementById('modal-bgp-peer-afi-l2vpn-cisco')) document.getElementById('modal-bgp-peer-afi-l2vpn-cisco').checked = false;
-  document.getElementById('modal-bgp-peer-router-id').value = '';
-  document.getElementById('modal-bgp-peer-remote-addr').value = '';
-  document.getElementById('modal-bgp-peer-remote-port').value = '';
-  document.getElementById('modal-bgp-peer-remote-as').value = '';
-  if (document.getElementById('modal-bgp-peer-remote-allow-as')) document.getElementById('modal-bgp-peer-remote-allow-as').value = '';
-  document.getElementById('modal-bgp-peer-local-addr').value = '';
-  document.getElementById('modal-bgp-peer-local-port').value = '';
-  document.getElementById('modal-bgp-peer-local-role').value = 'ebgp';
-  document.getElementById('modal-bgp-peer-password').value = '';
-  document.getElementById('modal-bgp-peer-multihop').checked = false;
-  if (document.getElementById('modal-bgp-peer-tx-ttl')) document.getElementById('modal-bgp-peer-tx-ttl').value = '';
-  if (document.getElementById('modal-bgp-peer-rx-min-ttl')) document.getElementById('modal-bgp-peer-rx-min-ttl').value = '';
-  document.getElementById('modal-bgp-peer-connect').checked = true;
-  document.getElementById('modal-bgp-peer-listen').checked = true;
-  
-  // Extra Tab
-  document.getElementById('modal-bgp-peer-holdtime').value = '00:00:30';
-  document.getElementById('modal-bgp-peer-keepalive').value = '00:00:10';
-  if (document.getElementById('modal-bgp-peer-use-bfd')) document.getElementById('modal-bgp-peer-use-bfd').checked = false;
-  if (document.getElementById('modal-bgp-peer-vrf')) document.getElementById('modal-bgp-peer-vrf').value = 'main';
-  if (document.getElementById('modal-bgp-peer-no-client-reflect')) document.getElementById('modal-bgp-peer-no-client-reflect').checked = true;
-  document.getElementById('modal-bgp-peer-redist-conn').checked = false;
-  document.getElementById('modal-bgp-peer-redist-static').checked = true;
-  if (document.getElementById('modal-bgp-peer-redist-rip')) document.getElementById('modal-bgp-peer-redist-rip').checked = false;
-  document.getElementById('modal-bgp-peer-redist-ospf').checked = false;
-  document.getElementById('modal-bgp-peer-redist-bgp').checked = false;
-  if (document.getElementById('modal-bgp-peer-redist-vpn')) document.getElementById('modal-bgp-peer-redist-vpn').checked = false;
-  if (document.getElementById('modal-bgp-peer-redist-dhcp')) document.getElementById('modal-bgp-peer-redist-dhcp').checked = false;
-  if (document.getElementById('modal-bgp-peer-redist-bgp-mpls-vpn')) document.getElementById('modal-bgp-peer-redist-bgp-mpls-vpn').checked = false;
-  if (document.getElementById('modal-bgp-peer-redist-slaac')) document.getElementById('modal-bgp-peer-redist-slaac').checked = false;
-  document.getElementById('modal-bgp-peer-default-orig').checked = false;
-  if (document.getElementById('modal-bgp-peer-network-blackhole')) document.getElementById('modal-bgp-peer-network-blackhole').checked = false;
-  if (document.getElementById('modal-bgp-peer-no-early-cut')) document.getElementById('modal-bgp-peer-no-early-cut').checked = false;
-  if (document.getElementById('modal-bgp-peer-keep-sent-attrs')) document.getElementById('modal-bgp-peer-keep-sent-attrs').checked = false;
-  if (document.getElementById('modal-bgp-peer-input-affinity')) document.getElementById('modal-bgp-peer-input-affinity').value = '';
-  if (document.getElementById('modal-bgp-peer-output-affinity')) document.getElementById('modal-bgp-peer-output-affinity').value = '';
-  
-  // Attributes Tab
-  document.getElementById('modal-bgp-peer-nexthop-choice').value = 'force-self';
-  document.getElementById('modal-bgp-peer-default-prepend').value = 0;
-  document.getElementById('modal-bgp-peer-allow-as-in').value = 0;
-  if (document.getElementById('modal-bgp-peer-ignore-as-path-len')) document.getElementById('modal-bgp-peer-ignore-as-path-len').checked = false;
-  document.getElementById('modal-bgp-peer-remove-priv-as').checked = false;
-  document.getElementById('modal-bgp-peer-as-override').checked = false;
-
-  // Filter Tab
+  document.getElementById('modal-bgp-peer-comment').value = '';
+  if (document.getElementById('modal-bgp-peer-local-as')) document.getElementById('modal-bgp-peer-local-as').value = '';
+  if (document.getElementById('modal-bgp-peer-remote-addr')) document.getElementById('modal-bgp-peer-remote-addr').value = '';
+  if (document.getElementById('modal-bgp-peer-remote-port')) document.getElementById('modal-bgp-peer-remote-port').value = '';
+  if (document.getElementById('modal-bgp-peer-remote-as')) document.getElementById('modal-bgp-peer-remote-as').value = '';
+  if (document.getElementById('modal-bgp-peer-local-addr')) document.getElementById('modal-bgp-peer-local-addr').value = '';
+  if (document.getElementById('modal-bgp-peer-local-port')) document.getElementById('modal-bgp-peer-local-port').value = '';
+  if (document.getElementById('modal-bgp-peer-local-role')) document.getElementById('modal-bgp-peer-local-role').value = 'ebgp';
+  if (document.getElementById('modal-bgp-peer-password')) document.getElementById('modal-bgp-peer-password').value = '';
+  if (document.getElementById('modal-bgp-peer-multihop')) document.getElementById('modal-bgp-peer-multihop').checked = false;
+  if (document.getElementById('modal-bgp-peer-passive')) document.getElementById('modal-bgp-peer-passive').checked = false;
+  if (document.getElementById('modal-bgp-peer-nexthop-self')) document.getElementById('modal-bgp-peer-nexthop-self').checked = false;
+  if (document.getElementById('modal-bgp-peer-holdtime')) document.getElementById('modal-bgp-peer-holdtime').value = '30';
+  if (document.getElementById('modal-bgp-peer-keepalive')) document.getElementById('modal-bgp-peer-keepalive').value = '10';
+
+  // Filters Tab
   populateFilterChainsDatalist();
-  document.getElementById('modal-bgp-peer-in-filter').value = '';
-  if (document.getElementById('modal-bgp-peer-in-accept-nlri')) document.getElementById('modal-bgp-peer-in-accept-nlri').value = '';
-  if (document.getElementById('modal-bgp-peer-in-accept-comm')) document.getElementById('modal-bgp-peer-in-accept-comm').value = '';
-  if (document.getElementById('modal-bgp-peer-in-accept-ext-comm')) document.getElementById('modal-bgp-peer-in-accept-ext-comm').value = '';
-  if (document.getElementById('modal-bgp-peer-in-accept-large-comm')) document.getElementById('modal-bgp-peer-in-accept-large-comm').value = '';
-  if (document.getElementById('modal-bgp-peer-in-filter-comm')) document.getElementById('modal-bgp-peer-in-filter-comm').value = '';
-  if (document.getElementById('modal-bgp-peer-in-filter-ext-comm')) document.getElementById('modal-bgp-peer-in-filter-ext-comm').value = '';
-  if (document.getElementById('modal-bgp-peer-in-filter-large-comm')) document.getElementById('modal-bgp-peer-in-filter-large-comm').value = '';
-  if (document.getElementById('modal-bgp-peer-in-filter-unknown')) document.getElementById('modal-bgp-peer-in-filter-unknown').checked = false;
-  document.getElementById('modal-bgp-peer-out-filter').value = '';
-  if (document.getElementById('modal-bgp-peer-out-selection-policy')) document.getElementById('modal-bgp-peer-out-selection-policy').value = 'disabled';
-  if (document.getElementById('modal-bgp-peer-out-network-name')) document.getElementById('modal-bgp-peer-out-network-name').value = '';
-
-  populateBgpRoutingTables();
-
+  if (document.getElementById('modal-bgp-peer-in-filter')) document.getElementById('modal-bgp-peer-in-filter').value = '';
+  if (document.getElementById('modal-bgp-peer-out-filter')) document.getElementById('modal-bgp-peer-out-filter').value = '';
+  if (document.getElementById('modal-bgp-peer-redist-conn')) document.getElementById('modal-bgp-peer-redist-conn').checked = false;
+  if (document.getElementById('modal-bgp-peer-redist-static')) document.getElementById('modal-bgp-peer-redist-static').checked = true;
+  if (document.getElementById('modal-bgp-peer-redist-ospf')) document.getElementById('modal-bgp-peer-redist-ospf').checked = false;
+  if (document.getElementById('modal-bgp-peer-default-orig')) document.getElementById('modal-bgp-peer-default-orig').checked = false;
+
+  // Advertised Networks Tab
   const container = document.getElementById('modal-bgp-output-networks-container');
   if (container) {
     container.innerHTML = '';
@@ -10287,6 +10247,7 @@ function populateFilterChainsDatalist() {
   });
   if (chains.size === 0) {
     chains.add('awmn');
+    chains.add('Internal');
     chains.add('bgp-in');
     chains.add('bgp-out');
   }
@@ -10302,7 +10263,6 @@ function openEditBgpPeerModal(id) {
   const p = (state.bgpPeers || []).find(item => item.id === id);
   if (!p) return;
 
-  populateBgpRoutingTables();
   populateFilterChainsDatalist();
 
   document.getElementById('modal-bgp-peer-id').value = p.id;
@@ -10310,74 +10270,38 @@ function openEditBgpPeerModal(id) {
   
   // General Tab
   document.getElementById('modal-bgp-peer-enabled').checked = p.enabled !== false && !p.disabled;
-  document.getElementById('modal-bgp-peer-comment').value = p.comment || '';
   document.getElementById('modal-bgp-peer-name').value = p.name || '';
-  if (document.getElementById('modal-bgp-peer-instance')) document.getElementById('modal-bgp-peer-instance').value = p.instance || 'bgp-instance-1';
-  if (document.getElementById('modal-bgp-peer-template')) document.getElementById('modal-bgp-peer-template').value = p.template || '';
-  document.getElementById('modal-bgp-peer-local-as').value = p.local_as || '';
-  document.getElementById('modal-bgp-peer-router-id').value = p.router_id || '';
-  document.getElementById('modal-bgp-peer-afi-ip').checked = true;
-  document.getElementById('modal-bgp-peer-afi-ipv6').checked = p.afi === 'ipv6';
-  document.getElementById('modal-bgp-peer-remote-addr').value = p.remote_address || '';
-  document.getElementById('modal-bgp-peer-remote-port').value = p.remote_port || '';
-  document.getElementById('modal-bgp-peer-remote-as').value = p.remote_as || '';
-  if (document.getElementById('modal-bgp-peer-remote-allow-as')) document.getElementById('modal-bgp-peer-remote-allow-as').value = p.remote_allow_as || '';
-  document.getElementById('modal-bgp-peer-local-addr').value = p.local_address || '';
-  document.getElementById('modal-bgp-peer-local-port').value = p.local_port || '';
-  document.getElementById('modal-bgp-peer-local-role').value = p.local_role || 'ebgp';
-  document.getElementById('modal-bgp-peer-password').value = p.password || '';
-  document.getElementById('modal-bgp-peer-multihop').checked = !!p.multihop;
-  if (document.getElementById('modal-bgp-peer-tx-ttl')) document.getElementById('modal-bgp-peer-tx-ttl').value = p.tx_ttl || '';
-  if (document.getElementById('modal-bgp-peer-rx-min-ttl')) document.getElementById('modal-bgp-peer-rx-min-ttl').value = p.rx_min_ttl || '';
-  document.getElementById('modal-bgp-peer-connect').checked = p.connect !== false;
-  document.getElementById('modal-bgp-peer-listen').checked = p.listen !== false;
-
-  // Extra Tab
-  document.getElementById('modal-bgp-peer-holdtime').value = p.hold_time ? formatBgpTime(p.hold_time) : '00:00:30';
-  document.getElementById('modal-bgp-peer-keepalive').value = p.keepalive_time ? formatBgpTime(p.keepalive_time) : '00:00:10';
-  if (document.getElementById('modal-bgp-peer-use-bfd')) document.getElementById('modal-bgp-peer-use-bfd').checked = !!p.use_bfd;
-  document.getElementById('modal-bgp-peer-routing-table').value = p.routing_table || 'main';
-  if (document.getElementById('modal-bgp-peer-vrf')) document.getElementById('modal-bgp-peer-vrf').value = p.vrf || 'main';
-  if (document.getElementById('modal-bgp-peer-no-client-reflect')) document.getElementById('modal-bgp-peer-no-client-reflect').checked = p.no_client_reflect !== false;
-  document.getElementById('modal-bgp-peer-redist-conn').checked = !!p.redist_connected;
-  document.getElementById('modal-bgp-peer-redist-static').checked = p.redist_static !== false;
-  if (document.getElementById('modal-bgp-peer-redist-rip')) document.getElementById('modal-bgp-peer-redist-rip').checked = !!p.redist_rip;
-  document.getElementById('modal-bgp-peer-redist-ospf').checked = !!p.redist_ospf;
-  document.getElementById('modal-bgp-peer-redist-bgp').checked = !!p.redist_bgp;
-  if (document.getElementById('modal-bgp-peer-redist-vpn')) document.getElementById('modal-bgp-peer-redist-vpn').checked = !!p.redist_vpn;
-  if (document.getElementById('modal-bgp-peer-redist-dhcp')) document.getElementById('modal-bgp-peer-redist-dhcp').checked = !!p.redist_dhcp;
-  if (document.getElementById('modal-bgp-peer-redist-bgp-mpls-vpn')) document.getElementById('modal-bgp-peer-redist-bgp-mpls-vpn').checked = !!p.redist_bgp_mpls_vpn;
-  if (document.getElementById('modal-bgp-peer-redist-slaac')) document.getElementById('modal-bgp-peer-redist-slaac').checked = !!p.redist_slaac;
-  document.getElementById('modal-bgp-peer-default-orig').checked = !!p.default_originate;
-  if (document.getElementById('modal-bgp-peer-network-blackhole')) document.getElementById('modal-bgp-peer-network-blackhole').checked = !!p.network_blackhole;
-  if (document.getElementById('modal-bgp-peer-no-early-cut')) document.getElementById('modal-bgp-peer-no-early-cut').checked = !!p.no_early_cut;
-  if (document.getElementById('modal-bgp-peer-keep-sent-attrs')) document.getElementById('modal-bgp-peer-keep-sent-attrs').checked = !!p.keep_sent_attrs;
-  if (document.getElementById('modal-bgp-peer-input-affinity')) document.getElementById('modal-bgp-peer-input-affinity').value = p.input_affinity || '';
-  if (document.getElementById('modal-bgp-peer-output-affinity')) document.getElementById('modal-bgp-peer-output-affinity').value = p.output_affinity || '';
-
-  // Attributes Tab
-  document.getElementById('modal-bgp-peer-nexthop-choice').value = p.nexthop_choice || (p.nexthop_self ? 'force-self' : 'default');
-  document.getElementById('modal-bgp-peer-default-prepend').value = p.default_prepend || 0;
-  document.getElementById('modal-bgp-peer-allow-as-in').value = p.allow_as_in || 0;
-  if (document.getElementById('modal-bgp-peer-ignore-as-path-len')) document.getElementById('modal-bgp-peer-ignore-as-path-len').checked = !!p.ignore_as_path_len;
-  document.getElementById('modal-bgp-peer-remove-priv-as').checked = !!p.remove_private_as;
-  document.getElementById('modal-bgp-peer-as-override').checked = !!p.as_override;
-
-  // Filter Tab
-  document.getElementById('modal-bgp-peer-in-filter').value = p.in_filter || '';
-  if (document.getElementById('modal-bgp-peer-in-accept-nlri')) document.getElementById('modal-bgp-peer-in-accept-nlri').value = p.in_accept_nlri || '';
-  if (document.getElementById('modal-bgp-peer-in-accept-comm')) document.getElementById('modal-bgp-peer-in-accept-comm').value = p.in_accept_communities || '';
-  if (document.getElementById('modal-bgp-peer-in-accept-ext-comm')) document.getElementById('modal-bgp-peer-in-accept-ext-comm').value = p.in_accept_ext_communities || '';
-  if (document.getElementById('modal-bgp-peer-in-accept-large-comm')) document.getElementById('modal-bgp-peer-in-accept-large-comm').value = p.in_accept_large_communities || '';
-  if (document.getElementById('modal-bgp-peer-in-filter-comm')) document.getElementById('modal-bgp-peer-in-filter-comm').value = p.in_filter_communities || '';
-  if (document.getElementById('modal-bgp-peer-in-filter-ext-comm')) document.getElementById('modal-bgp-peer-in-filter-ext-comm').value = p.in_filter_ext_communities || '';
-  if (document.getElementById('modal-bgp-peer-in-filter-large-comm')) document.getElementById('modal-bgp-peer-in-filter-large-comm').value = p.in_filter_large_communities || '';
-  if (document.getElementById('modal-bgp-peer-in-filter-unknown')) document.getElementById('modal-bgp-peer-in-filter-unknown').checked = !!p.in_filter_unknown;
-  document.getElementById('modal-bgp-peer-out-filter').value = p.out_filter || '';
-  if (document.getElementById('modal-bgp-peer-out-selection-policy')) document.getElementById('modal-bgp-peer-out-selection-policy').value = p.out_selection_policy || 'disabled';
-  if (document.getElementById('modal-bgp-peer-out-network-name')) document.getElementById('modal-bgp-peer-out-network-name').value = p.output_network || '';
-
-  // Output Networks
+  document.getElementById('modal-bgp-peer-comment').value = p.comment || '';
+  if (document.getElementById('modal-bgp-peer-local-as')) document.getElementById('modal-bgp-peer-local-as').value = p.local_as || '';
+  if (document.getElementById('modal-bgp-peer-remote-addr')) document.getElementById('modal-bgp-peer-remote-addr').value = p.remote_address || '';
+  if (document.getElementById('modal-bgp-peer-remote-port')) document.getElementById('modal-bgp-peer-remote-port').value = p.remote_port || '';
+  if (document.getElementById('modal-bgp-peer-remote-as')) document.getElementById('modal-bgp-peer-remote-as').value = p.remote_as || '';
+  if (document.getElementById('modal-bgp-peer-local-addr')) document.getElementById('modal-bgp-peer-local-addr').value = p.local_address || '';
+  if (document.getElementById('modal-bgp-peer-local-port')) document.getElementById('modal-bgp-peer-local-port').value = p.local_port || '';
+  if (document.getElementById('modal-bgp-peer-local-role')) document.getElementById('modal-bgp-peer-local-role').value = p.local_role || 'ebgp';
+  if (document.getElementById('modal-bgp-peer-password')) document.getElementById('modal-bgp-peer-password').value = p.password || '';
+  if (document.getElementById('modal-bgp-peer-multihop')) document.getElementById('modal-bgp-peer-multihop').checked = !!p.multihop;
+  
+  // Passive mode
+  const isPassive = !!p.passive || (p.connect === false && p.listen !== false);
+  if (document.getElementById('modal-bgp-peer-passive')) document.getElementById('modal-bgp-peer-passive').checked = isPassive;
+
+  // Next-hop self
+  const isNexthopSelf = !!p.nexthop_self || p.nexthop_choice === 'force-self';
+  if (document.getElementById('modal-bgp-peer-nexthop-self')) document.getElementById('modal-bgp-peer-nexthop-self').checked = isNexthopSelf;
+
+  if (document.getElementById('modal-bgp-peer-holdtime')) document.getElementById('modal-bgp-peer-holdtime').value = p.hold_time ? String(p.hold_time) : '30';
+  if (document.getElementById('modal-bgp-peer-keepalive')) document.getElementById('modal-bgp-peer-keepalive').value = p.keepalive_time ? String(p.keepalive_time) : '10';
+
+  // Filters Tab
+  if (document.getElementById('modal-bgp-peer-in-filter')) document.getElementById('modal-bgp-peer-in-filter').value = p.in_filter || '';
+  if (document.getElementById('modal-bgp-peer-out-filter')) document.getElementById('modal-bgp-peer-out-filter').value = p.out_filter || '';
+  if (document.getElementById('modal-bgp-peer-redist-conn')) document.getElementById('modal-bgp-peer-redist-conn').checked = !!p.redist_connected;
+  if (document.getElementById('modal-bgp-peer-redist-static')) document.getElementById('modal-bgp-peer-redist-static').checked = p.redist_static !== false;
+  if (document.getElementById('modal-bgp-peer-redist-ospf')) document.getElementById('modal-bgp-peer-redist-ospf').checked = !!p.redist_ospf;
+  if (document.getElementById('modal-bgp-peer-default-orig')) document.getElementById('modal-bgp-peer-default-orig').checked = !!p.default_originate;
+
+  // Advertised Networks Tab
   const container = document.getElementById('modal-bgp-output-networks-container');
   if (container) {
     container.innerHTML = '';
@@ -10399,7 +10323,7 @@ function copyCurrentBgpPeer() {
   document.getElementById('modal-bgp-peer-id').value = '';
   const nameEl = document.getElementById('modal-bgp-peer-name');
   if (nameEl) nameEl.value = (nameEl.value || 'peer') + '-copy';
-  document.getElementById('bgp-peer-modal-title').innerText = 'New...';
+  document.getElementById('bgp-peer-modal-title').innerText = 'New BGP Connection...';
   const removeBtn = document.getElementById('modal-btn-remove-peer');
   if (removeBtn) removeBtn.classList.add('hidden');
   showToast('Cloned', 'BGP connection copied to new draft', 'info');
@@ -10425,6 +10349,8 @@ function getBgpPeerFormData() {
   });
 
   const enabled = document.getElementById('modal-bgp-peer-enabled').checked;
+  const isPassive = document.getElementById('modal-bgp-peer-passive')?.checked || false;
+  const isNexthopSelf = document.getElementById('modal-bgp-peer-nexthop-self')?.checked || false;
 
   return {
     id: document.getElementById('modal-bgp-peer-id').value,
@@ -10432,64 +10358,28 @@ function getBgpPeerFormData() {
     enabled: enabled,
     disabled: !enabled,
     comment: document.getElementById('modal-bgp-peer-comment').value.trim(),
-    instance: document.getElementById('modal-bgp-peer-instance')?.value.trim() || 'bgp-instance-1',
-    template: document.getElementById('modal-bgp-peer-template')?.value.trim() || '',
     local_as: parseInt(document.getElementById('modal-bgp-peer-local-as')?.value, 10) || 0,
-    router_id: document.getElementById('modal-bgp-peer-router-id').value.trim(),
-    afi: document.getElementById('modal-bgp-peer-afi-ipv6').checked ? 'ipv6' : 'ip',
     remote_address: document.getElementById('modal-bgp-peer-remote-addr').value.trim(),
     remote_port: parseInt(document.getElementById('modal-bgp-peer-remote-port').value, 10) || 0,
     remote_as: parseInt(document.getElementById('modal-bgp-peer-remote-as').value, 10) || 0,
-    remote_allow_as: document.getElementById('modal-bgp-peer-remote-allow-as')?.value.trim() || '',
-    local_address: document.getElementById('modal-bgp-peer-local-addr').value.trim(),
-    local_port: parseInt(document.getElementById('modal-bgp-peer-local-port').value, 10) || 0,
-    local_role: document.getElementById('modal-bgp-peer-local-role').value,
-    password: document.getElementById('modal-bgp-peer-password').value,
-    multihop: document.getElementById('modal-bgp-peer-multihop').checked,
-    tx_ttl: parseInt(document.getElementById('modal-bgp-peer-tx-ttl')?.value, 10) || 0,
-    rx_min_ttl: parseInt(document.getElementById('modal-bgp-peer-rx-min-ttl')?.value, 10) || 0,
-    connect: document.getElementById('modal-bgp-peer-connect').checked,
-    listen: document.getElementById('modal-bgp-peer-listen').checked,
-    hold_time: parseBgpTime(document.getElementById('modal-bgp-peer-holdtime').value),
-    keepalive_time: parseBgpTime(document.getElementById('modal-bgp-peer-keepalive').value),
-    use_bfd: document.getElementById('modal-bgp-peer-use-bfd')?.checked || false,
-    routing_table: document.getElementById('modal-bgp-peer-routing-table').value,
-    vrf: document.getElementById('modal-bgp-peer-vrf')?.value.trim() || 'main',
-    no_client_reflect: document.getElementById('modal-bgp-peer-no-client-reflect')?.checked || false,
-    redist_connected: document.getElementById('modal-bgp-peer-redist-conn').checked,
-    redist_static: document.getElementById('modal-bgp-peer-redist-static').checked,
-    redist_rip: document.getElementById('modal-bgp-peer-redist-rip')?.checked || false,
-    redist_ospf: document.getElementById('modal-bgp-peer-redist-ospf').checked,
-    redist_bgp: document.getElementById('modal-bgp-peer-redist-bgp').checked,
-    redist_vpn: document.getElementById('modal-bgp-peer-redist-vpn')?.checked || false,
-    redist_dhcp: document.getElementById('modal-bgp-peer-redist-dhcp')?.checked || false,
-    redist_bgp_mpls_vpn: document.getElementById('modal-bgp-peer-redist-bgp-mpls-vpn')?.checked || false,
-    redist_slaac: document.getElementById('modal-bgp-peer-redist-slaac')?.checked || false,
-    default_originate: document.getElementById('modal-bgp-peer-default-orig').checked,
-    network_blackhole: document.getElementById('modal-bgp-peer-network-blackhole')?.checked || false,
-    no_early_cut: document.getElementById('modal-bgp-peer-no-early-cut')?.checked || false,
-    keep_sent_attrs: document.getElementById('modal-bgp-peer-keep-sent-attrs')?.checked || false,
-    input_affinity: (document.getElementById('modal-bgp-peer-input-affinity')?.value || '').trim(),
-    output_affinity: (document.getElementById('modal-bgp-peer-output-affinity')?.value || '').trim(),
-    nexthop_choice: document.getElementById('modal-bgp-peer-nexthop-choice').value,
-    nexthop_self: document.getElementById('modal-bgp-peer-nexthop-choice').value === 'force-self',
-    default_prepend: parseInt(document.getElementById('modal-bgp-peer-default-prepend').value, 10) || 0,
-    allow_as_in: parseInt(document.getElementById('modal-bgp-peer-allow-as-in').value, 10) || 0,
-    ignore_as_path_len: document.getElementById('modal-bgp-peer-ignore-as-path-len')?.checked || false,
-    remove_private_as: document.getElementById('modal-bgp-peer-remove-priv-as').checked,
-    as_override: document.getElementById('modal-bgp-peer-as-override').checked,
+    local_address: document.getElementById('modal-bgp-peer-local-addr')?.value.trim() || '',
+    local_port: parseInt(document.getElementById('modal-bgp-peer-local-port')?.value, 10) || 0,
+    local_role: document.getElementById('modal-bgp-peer-local-role')?.value || 'ebgp',
+    password: document.getElementById('modal-bgp-peer-password')?.value || '',
+    multihop: document.getElementById('modal-bgp-peer-multihop')?.checked || false,
+    passive: isPassive,
+    connect: !isPassive,
+    listen: true,
+    hold_time: parseBgpTime(document.getElementById('modal-bgp-peer-holdtime')?.value),
+    keepalive_time: parseBgpTime(document.getElementById('modal-bgp-peer-keepalive')?.value),
+    nexthop_self: isNexthopSelf,
+    nexthop_choice: isNexthopSelf ? 'force-self' : 'default',
     in_filter: (document.getElementById('modal-bgp-peer-in-filter')?.value || '').trim(),
-    in_accept_nlri: (document.getElementById('modal-bgp-peer-in-accept-nlri')?.value || '').trim(),
-    in_accept_communities: (document.getElementById('modal-bgp-peer-in-accept-comm')?.value || '').trim(),
-    in_accept_ext_communities: (document.getElementById('modal-bgp-peer-in-accept-ext-comm')?.value || '').trim(),
-    in_accept_large_communities: (document.getElementById('modal-bgp-peer-in-accept-large-comm')?.value || '').trim(),
-    in_filter_communities: (document.getElementById('modal-bgp-peer-in-filter-comm')?.value || '').trim(),
-    in_filter_ext_communities: (document.getElementById('modal-bgp-peer-in-filter-ext-comm')?.value || '').trim(),
-    in_filter_large_communities: (document.getElementById('modal-bgp-peer-in-filter-large-comm')?.value || '').trim(),
-    in_filter_unknown: document.getElementById('modal-bgp-peer-in-filter-unknown')?.checked || false,
     out_filter: (document.getElementById('modal-bgp-peer-out-filter')?.value || '').trim(),
-    out_selection_policy: document.getElementById('modal-bgp-peer-out-selection-policy')?.value || 'disabled',
-    output_network: (document.getElementById('modal-bgp-peer-out-network-name')?.value || '').trim(),
+    default_originate: document.getElementById('modal-bgp-peer-default-orig')?.checked || false,
+    redist_connected: document.getElementById('modal-bgp-peer-redist-conn')?.checked || false,
+    redist_static: document.getElementById('modal-bgp-peer-redist-static')?.checked !== false,
+    redist_ospf: document.getElementById('modal-bgp-peer-redist-ospf')?.checked || false,
     output_networks: outputNetworks
   };
 }

internal/web/static/index.html

@@ -2764,6 +2764,7 @@
                   <tr>
                     <th class="py-2.5 px-3">Network (CIDR)</th>
                     <th class="py-2.5 px-3">Status</th>
+                    <th class="py-2.5 px-3">Discard Route</th>
                     <th class="py-2.5 px-3">Comment</th>
                     <th class="py-2.5 px-3 text-right font-sans">Actions</th>
                   </tr>
@@ -9256,9 +9257,8 @@
       <!-- Tab Navigation -->
       <div class="flex border-b border-slate-800 bg-slate-950/30 px-6 gap-2">
         <button type="button" id="bgp-peer-tab-btn-general" onclick="switchBgpPeerModalTab('general')" class="px-4 py-2 text-xs font-bold border-b-2 border-cyan-500 text-white transition">General</button>
-        <button type="button" id="bgp-peer-tab-btn-extra" onclick="switchBgpPeerModalTab('extra')" class="px-4 py-2 text-xs font-bold border-b-2 border-transparent text-slate-400 hover:text-slate-200 transition">Extra</button>
-        <button type="button" id="bgp-peer-tab-btn-attributes" onclick="switchBgpPeerModalTab('attributes')" class="px-4 py-2 text-xs font-bold border-b-2 border-transparent text-slate-400 hover:text-slate-200 transition">Attributes</button>
-        <button type="button" id="bgp-peer-tab-btn-filter" onclick="switchBgpPeerModalTab('filter')" class="px-4 py-2 text-xs font-bold border-b-2 border-transparent text-slate-400 hover:text-slate-200 transition">Filter</button>
+        <button type="button" id="bgp-peer-tab-btn-filters" onclick="switchBgpPeerModalTab('filters')" class="px-4 py-2 text-xs font-bold border-b-2 border-transparent text-slate-400 hover:text-slate-200 transition">Routing &amp; Filters</button>
+        <button type="button" id="bgp-peer-tab-btn-networks" onclick="switchBgpPeerModalTab('networks')" class="px-4 py-2 text-xs font-bold border-b-2 border-transparent text-slate-400 hover:text-slate-200 transition">Advertised Networks</button>
       </div>
 
       <!-- Body Form -->
@@ -9279,81 +9279,32 @@
               </div>
 
               <div class="grid grid-cols-3 items-center gap-3">
-                <label class="text-slate-400 font-medium">Comment</label>
-                <div class="col-span-2">
-                  <input type="text" id="modal-bgp-peer-comment" placeholder="Optional notes" class="w-full bg-slate-800 border border-slate-700 rounded-lg px-3 py-1.5 text-white">
-                </div>
-              </div>
-
-              <div class="grid grid-cols-3 items-center gap-3">
-                <label class="text-slate-400 font-medium">Name *</label>
-                <div class="col-span-2">
-                  <input type="text" id="modal-bgp-peer-name" required placeholder="ebgp-JB172-2" class="w-full bg-slate-800 border border-slate-700 rounded-lg px-3 py-1.5 text-white font-mono">
-                </div>
-              </div>
-
-              <div class="grid grid-cols-3 items-center gap-3">
-                <label class="text-slate-400 font-medium">Instance</label>
-                <div class="col-span-2 flex items-center gap-1.5">
-                  <input type="text" id="modal-bgp-peer-instance" placeholder="bgp-instance-1" class="flex-1 bg-slate-800 border border-slate-700 rounded-lg px-3 py-1.5 text-white font-mono">
-                  <button type="button" onclick="openBgpInstanceModal()" class="px-2 py-1 bg-slate-800 hover:bg-slate-700 border border-slate-700 rounded text-slate-300 font-mono text-xs">...</button>
-                </div>
-              </div>
-
-              <div class="grid grid-cols-3 items-center gap-3">
-                <label class="text-slate-400 font-medium">Template</label>
+                <label class="text-slate-400 font-medium">Connection Name *</label>
                 <div class="col-span-2">
-                  <input type="text" id="modal-bgp-peer-template" placeholder="AWMN-ebgp (Optional)" class="w-full bg-slate-800 border border-slate-700 rounded-lg px-3 py-1.5 text-white font-mono">
+                  <input type="text" id="modal-bgp-peer-name" required placeholder="e.g. Primcast, ebgp-JB172" class="w-full bg-slate-800 border border-slate-700 rounded-lg px-3 py-1.5 text-white font-mono">
                 </div>
               </div>
 
               <div class="grid grid-cols-3 items-center gap-3">
-                <label class="text-slate-400 font-medium">AS (Local AS)</label>
+                <label class="text-slate-400 font-medium">Comment</label>
                 <div class="col-span-2">
-                  <input type="number" id="modal-bgp-peer-local-as" min="1" max="4294967295" placeholder="e.g. 6610 (Multi-Instance Local AS)" class="w-full bg-slate-800 border border-slate-700 rounded-lg px-3 py-1.5 text-white font-mono">
-                  <p class="text-[10px] text-slate-500 mt-0.5">Custom Local AS for this BGP session (Multi-Instance). Leave blank to use Global Router AS.</p>
+                  <input type="text" id="modal-bgp-peer-comment" placeholder="Optional notes / description" class="w-full bg-slate-800 border border-slate-700 rounded-lg px-3 py-1.5 text-white">
                 </div>
               </div>
 
-              <div class="grid grid-cols-3 items-center gap-3">
-                <label class="text-slate-400 font-medium">AFI</label>
-                <div class="col-span-2 flex items-center flex-wrap gap-3 text-slate-300">
-                  <label class="flex items-center gap-1.5 cursor-pointer">
-                    <input type="checkbox" id="modal-bgp-peer-afi-ip" checked class="rounded text-cyan-500 bg-slate-800 border-slate-700">
-                    <span>ip</span>
-                  </label>
-                  <label class="flex items-center gap-1.5 cursor-pointer">
-                    <input type="checkbox" id="modal-bgp-peer-afi-ipv6" class="rounded text-cyan-500 bg-slate-800 border-slate-700">
-                    <span>ipv6</span>
-                  </label>
-                  <label class="flex items-center gap-1.5 cursor-pointer">
-                    <input type="checkbox" id="modal-bgp-peer-afi-l2vpn" class="rounded text-cyan-500 bg-slate-800 border-slate-700">
-                    <span>l2vpn</span>
-                  </label>
-                  <label class="flex items-center gap-1.5 cursor-pointer">
-                    <input type="checkbox" id="modal-bgp-peer-afi-vpnv4" class="rounded text-cyan-500 bg-slate-800 border-slate-700">
-                    <span>vpnv4</span>
-                  </label>
-                  <label class="flex items-center gap-1.5 cursor-pointer">
-                    <input type="checkbox" id="modal-bgp-peer-afi-l2vpn-cisco" class="rounded text-cyan-500 bg-slate-800 border-slate-700">
-                    <span>l2vpn cisco</span>
-                  </label>
-                </div>
-              </div>
+              <hr class="border-slate-800/80 my-2">
 
               <div class="grid grid-cols-3 items-center gap-3">
-                <label class="text-slate-400 font-medium">Router ID</label>
+                <label class="text-slate-400 font-medium">Remote AS *</label>
                 <div class="col-span-2">
-                  <input type="text" id="modal-bgp-peer-router-id" placeholder="e.g. 10.42.62.254 (Optional override)" class="w-full bg-slate-800 border border-slate-700 rounded-lg px-3 py-1.5 text-white font-mono">
+                  <input type="number" id="modal-bgp-peer-remote-as" required min="1" max="4294967295" placeholder="e.g. 65555" class="w-full bg-slate-800 border border-slate-700 rounded-lg px-3 py-1.5 text-white font-mono">
                 </div>
               </div>
 
-              <hr class="border-slate-800/80 my-2">
-
               <div class="grid grid-cols-3 items-center gap-3">
                 <label class="text-slate-400 font-medium">Remote Address *</label>
                 <div class="col-span-2">
-                  <input type="text" id="modal-bgp-peer-remote-addr" required placeholder="10.2.51.249" class="w-full bg-slate-800 border border-slate-700 rounded-lg px-3 py-1.5 text-white font-mono">
+                  <input type="text" id="modal-bgp-peer-remote-addr" required placeholder="e.g. 192.168.129.225" class="w-full bg-slate-800 border border-slate-700 rounded-lg px-3 py-1.5 text-white font-mono">
                 </div>
               </div>
 
@@ -9364,194 +9315,61 @@
                 </div>
               </div>
 
-              <div class="grid grid-cols-3 items-center gap-3">
-                <label class="text-slate-400 font-medium">Remote AS *</label>
-                <div class="col-span-2">
-                  <input type="number" id="modal-bgp-peer-remote-as" required min="1" max="4294967295" placeholder="17244" class="w-full bg-slate-800 border border-slate-700 rounded-lg px-3 py-1.5 text-white font-mono">
-                </div>
-              </div>
-
-              <div class="grid grid-cols-3 items-center gap-3">
-                <label class="text-slate-400 font-medium">Remote Allow AS</label>
-                <div class="col-span-2">
-                  <input type="text" id="modal-bgp-peer-remote-allow-as" placeholder="e.g. 17244,65000 (Optional)" class="w-full bg-slate-800 border border-slate-700 rounded-lg px-3 py-1.5 text-white font-mono">
-                </div>
-              </div>
-
               <hr class="border-slate-800/80 my-2">
 
               <div class="grid grid-cols-3 items-center gap-3">
-                <label class="text-slate-400 font-medium">Local Address</label>
-                <div class="col-span-2">
-                  <input type="text" id="modal-bgp-peer-local-addr" placeholder="e.g. 10.2.51.250" class="w-full bg-slate-800 border border-slate-700 rounded-lg px-3 py-1.5 text-white font-mono">
-                </div>
-              </div>
-
-              <div class="grid grid-cols-3 items-center gap-3">
-                <label class="text-slate-400 font-medium">Local Port</label>
-                <div class="col-span-2">
-                  <input type="number" id="modal-bgp-peer-local-port" placeholder="Optional bind port" min="1" max="65535" class="w-full bg-slate-800 border border-slate-700 rounded-lg px-3 py-1.5 text-white font-mono">
-                </div>
-              </div>
-
-              <div class="grid grid-cols-3 items-center gap-3">
-                <label class="text-slate-400 font-medium">Local Role</label>
-                <div class="col-span-2">
-                  <select id="modal-bgp-peer-local-role" class="w-full bg-slate-800 border border-slate-700 rounded-lg px-3 py-1.5 text-white font-mono">
-                    <option value="ebgp">ebgp</option>
-                    <option value="ibgp">ibgp</option>
-                  </select>
-                </div>
-              </div>
-
-              <div class="grid grid-cols-3 items-center gap-3">
-                <label class="text-slate-400 font-medium">TCP MD5 Key</label>
+                <label class="text-slate-400 font-medium">Local AS (Override)</label>
                 <div class="col-span-2">
-                  <input type="password" id="modal-bgp-peer-password" placeholder="BGP authentication secret" class="w-full bg-slate-800 border border-slate-700 rounded-lg px-3 py-1.5 text-white font-mono">
+                  <input type="number" id="modal-bgp-peer-local-as" min="1" max="4294967295" placeholder="Leave blank to use Global Router AS" class="w-full bg-slate-800 border border-slate-700 rounded-lg px-3 py-1.5 text-white font-mono">
+                  <p class="text-[10px] text-slate-500 mt-0.5">Per-peer Local AS override. If blank, uses global BGP Instance AS.</p>
                 </div>
               </div>
 
-              <hr class="border-slate-800/80 my-2">
-
               <div class="grid grid-cols-3 items-center gap-3">
-                <label class="text-slate-400 font-medium">Multi-hop</label>
-                <div class="col-span-2">
-                  <label class="flex items-center gap-2 cursor-pointer text-slate-300">
-                    <input type="checkbox" id="modal-bgp-peer-multihop" class="rounded text-cyan-500 bg-slate-800 border-slate-700">
-                    <span>Enable eBGP Multi-hop</span>
-                  </label>
-                </div>
-              </div>
-
-              <div class="grid grid-cols-3 items-center gap-3">
-                <label class="text-slate-400 font-medium">TTL Limits</label>
-                <div class="col-span-2 grid grid-cols-2 gap-3">
-                  <div>
-                    <span class="text-[10px] text-slate-500 block mb-0.5">Tx TTL</span>
-                    <input type="number" id="modal-bgp-peer-tx-ttl" min="1" max="255" placeholder="64 (default)" class="w-full bg-slate-800 border border-slate-700 rounded-lg px-3 py-1 text-white font-mono">
+                <label class="text-slate-400 font-medium">Local Address &amp; Port</label>
+                <div class="col-span-2 grid grid-cols-3 gap-2">
+                  <div class="col-span-2">
+                    <input type="text" id="modal-bgp-peer-local-addr" placeholder="Optional bind IP (e.g. 192.168.129.226)" class="w-full bg-slate-800 border border-slate-700 rounded-lg px-3 py-1.5 text-white font-mono">
                   </div>
                   <div>
-                    <span class="text-[10px] text-slate-500 block mb-0.5">Rx Min TTL</span>
-                    <input type="number" id="modal-bgp-peer-rx-min-ttl" min="0" max="255" placeholder="0 (any)" class="w-full bg-slate-800 border border-slate-700 rounded-lg px-3 py-1 text-white font-mono">
+                    <input type="number" id="modal-bgp-peer-local-port" placeholder="Port" min="1" max="65535" class="w-full bg-slate-800 border border-slate-700 rounded-lg px-3 py-1.5 text-white font-mono">
                   </div>
                 </div>
               </div>
 
               <div class="grid grid-cols-3 items-center gap-3">
-                <label class="text-slate-400 font-medium">Session Mode</label>
-                <div class="col-span-2 flex items-center gap-6 text-slate-300">
-                  <label class="flex items-center gap-2 cursor-pointer">
-                    <input type="checkbox" id="modal-bgp-peer-connect" checked class="rounded text-cyan-500 bg-slate-800 border-slate-700">
-                    <span>Connect</span>
-                  </label>
-                  <label class="flex items-center gap-2 cursor-pointer">
-                    <input type="checkbox" id="modal-bgp-peer-listen" checked class="rounded text-cyan-500 bg-slate-800 border-slate-700">
-                    <span>Listen</span>
-                  </label>
-                </div>
-              </div>
-            </div>
-
-            <!-- TAB 2: EXTRA -->
-            <div id="bgp-peer-tab-extra" class="space-y-3.5 hidden">
-              <div class="grid grid-cols-3 items-center gap-3">
-                <label class="text-slate-400 font-medium">Hold Time</label>
-                <div class="col-span-2">
-                  <input type="text" id="modal-bgp-peer-holdtime" placeholder="00:00:30 (30s) or 00:03:00" class="w-full bg-slate-800 border border-slate-700 rounded-lg px-3 py-1.5 text-white font-mono">
-                </div>
-              </div>
-
-              <div class="grid grid-cols-3 items-center gap-3">
-                <label class="text-slate-400 font-medium">Keepalive Time</label>
-                <div class="col-span-2">
-                  <input type="text" id="modal-bgp-peer-keepalive" placeholder="00:00:10 (10s) or 00:01:00" class="w-full bg-slate-800 border border-slate-700 rounded-lg px-3 py-1.5 text-white font-mono">
-                </div>
-              </div>
-
-              <div class="grid grid-cols-3 items-center gap-3">
-                <label class="text-slate-400 font-medium">Use BFD</label>
-                <div class="col-span-2">
-                  <label class="flex items-center gap-2 cursor-pointer text-slate-300">
-                    <input type="checkbox" id="modal-bgp-peer-use-bfd" class="rounded text-cyan-500 bg-slate-800 border-slate-700">
-                    <span>Enable Bidirectional Forwarding Detection (BFD)</span>
-                  </label>
-                </div>
-              </div>
-
-              <div class="grid grid-cols-3 items-center gap-3">
-                <label class="text-slate-400 font-medium">Routing Table</label>
+                <label class="text-slate-400 font-medium">Local Role</label>
                 <div class="col-span-2">
-                  <select id="modal-bgp-peer-routing-table" class="w-full bg-slate-800 border border-slate-700 rounded-lg px-3 py-1.5 text-white font-mono">
-                    <option value="main">main</option>
+                  <select id="modal-bgp-peer-local-role" class="w-full bg-slate-800 border border-slate-700 rounded-lg px-3 py-1.5 text-white font-mono">
+                    <option value="ebgp">ebgp (External BGP - Default)</option>
+                    <option value="ibgp">ibgp (Internal BGP)</option>
                   </select>
                 </div>
               </div>
 
               <div class="grid grid-cols-3 items-center gap-3">
-                <label class="text-slate-400 font-medium">VRF</label>
+                <label class="text-slate-400 font-medium">TCP MD5 Secret</label>
                 <div class="col-span-2">
-                  <input type="text" id="modal-bgp-peer-vrf" placeholder="main (default)" class="w-full bg-slate-800 border border-slate-700 rounded-lg px-3 py-1.5 text-white font-mono">
-                </div>
-              </div>
-
-              <div class="grid grid-cols-3 items-center gap-3">
-                <label class="text-slate-400 font-medium">Client Reflection</label>
-                <div class="col-span-2">
-                  <label class="flex items-center gap-2 cursor-pointer text-slate-300">
-                    <input type="checkbox" id="modal-bgp-peer-no-client-reflect" checked class="rounded text-cyan-500 bg-slate-800 border-slate-700">
-                    <span>No Client To Client Reflection</span>
-                  </label>
+                  <input type="password" id="modal-bgp-peer-password" placeholder="BGP authentication password (optional)" class="w-full bg-slate-800 border border-slate-700 rounded-lg px-3 py-1.5 text-white font-mono">
                 </div>
               </div>
 
               <hr class="border-slate-800/80 my-2">
 
               <div class="grid grid-cols-3 items-start gap-3">
-                <label class="text-slate-400 font-medium pt-1">Output Redistribute</label>
-                <div class="col-span-2 grid grid-cols-3 gap-2 text-slate-300">
-                  <label class="flex items-center gap-2 cursor-pointer">
-                    <input type="checkbox" id="modal-bgp-peer-redist-conn" class="rounded text-cyan-500 bg-slate-800 border-slate-700">
-                    <span>connected</span>
-                  </label>
-                  <label class="flex items-center gap-2 cursor-pointer">
-                    <input type="checkbox" id="modal-bgp-peer-redist-static" checked class="rounded text-cyan-500 bg-slate-800 border-slate-700">
-                    <span>static</span>
-                  </label>
-                  <label class="flex items-center gap-2 cursor-pointer">
-                    <input type="checkbox" id="modal-bgp-peer-redist-rip" class="rounded text-cyan-500 bg-slate-800 border-slate-700">
-                    <span>rip</span>
-                  </label>
-                  <label class="flex items-center gap-2 cursor-pointer">
-                    <input type="checkbox" id="modal-bgp-peer-redist-ospf" class="rounded text-cyan-500 bg-slate-800 border-slate-700">
-                    <span>ospf</span>
-                  </label>
+                <label class="text-slate-400 font-medium pt-1">Session Flags</label>
+                <div class="col-span-2 space-y-2 text-slate-300">
                   <label class="flex items-center gap-2 cursor-pointer">
-                    <input type="checkbox" id="modal-bgp-peer-redist-bgp" class="rounded text-cyan-500 bg-slate-800 border-slate-700">
-                    <span>bgp</span>
-                  </label>
-                  <label class="flex items-center gap-2 cursor-pointer">
-                    <input type="checkbox" id="modal-bgp-peer-redist-vpn" class="rounded text-cyan-500 bg-slate-800 border-slate-700">
-                    <span>vpn</span>
-                  </label>
-                  <label class="flex items-center gap-2 cursor-pointer">
-                    <input type="checkbox" id="modal-bgp-peer-redist-dhcp" class="rounded text-cyan-500 bg-slate-800 border-slate-700">
-                    <span>dhcp</span>
-                  </label>
-                  <label class="flex items-center gap-2 cursor-pointer">
-                    <input type="checkbox" id="modal-bgp-peer-redist-fantasy" class="rounded text-cyan-500 bg-slate-800 border-slate-700">
-                    <span>fantasy</span>
-                  </label>
-                  <label class="flex items-center gap-2 cursor-pointer">
-                    <input type="checkbox" id="modal-bgp-peer-redist-modem" class="rounded text-cyan-500 bg-slate-800 border-slate-700">
-                    <span>modem</span>
+                    <input type="checkbox" id="modal-bgp-peer-multihop" class="rounded text-cyan-500 bg-slate-800 border-slate-700">
+                    <span>eBGP Multi-hop (allow peers across multiple routing hops)</span>
                   </label>
                   <label class="flex items-center gap-2 cursor-pointer">
-                    <input type="checkbox" id="modal-bgp-peer-redist-bgp-mpls-vpn" class="rounded text-cyan-500 bg-slate-800 border-slate-700">
-                    <span>bgp-mpls-vpn</span>
+                    <input type="checkbox" id="modal-bgp-peer-passive" class="rounded text-cyan-500 bg-slate-800 border-slate-700">
+                    <span>Passive Mode (Listen only, do not initiate connection actively)</span>
                   </label>
                   <label class="flex items-center gap-2 cursor-pointer">
-                    <input type="checkbox" id="modal-bgp-peer-redist-slaac" class="rounded text-cyan-500 bg-slate-800 border-slate-700">
-                    <span>slaac</span>
+                    <input type="checkbox" id="modal-bgp-peer-nexthop-self" class="rounded text-cyan-500 bg-slate-800 border-slate-700">
+                    <span>Next-Hop Self (Rewrite next-hop to local router address)</span>
                   </label>
                 </div>
               </div>
@@ -9559,230 +9377,89 @@
               <hr class="border-slate-800/80 my-2">
 
               <div class="grid grid-cols-3 items-center gap-3">
-                <label class="text-slate-400 font-medium">Default Originate</label>
-                <div class="col-span-2">
-                  <label class="flex items-center gap-2 cursor-pointer text-slate-300">
-                    <input type="checkbox" id="modal-bgp-peer-default-orig" class="rounded text-cyan-500 bg-slate-800 border-slate-700">
-                    <span>Announce Default Route (0.0.0.0/0)</span>
-                  </label>
-                </div>
-              </div>
-
-              <div class="grid grid-cols-3 items-center gap-3">
-                <label class="text-slate-400 font-medium">Network Blackhole</label>
-                <div class="col-span-2">
-                  <label class="flex items-center gap-2 cursor-pointer text-slate-300">
-                    <input type="checkbox" id="modal-bgp-peer-network-blackhole" class="rounded text-cyan-500 bg-slate-800 border-slate-700">
-                    <span>Drop unroutable traffic via blackhole</span>
-                  </label>
-                </div>
-              </div>
-
-              <div class="grid grid-cols-3 items-center gap-3">
-                <label class="text-slate-400 font-medium">No Early Cut</label>
-                <div class="col-span-2">
-                  <label class="flex items-center gap-2 cursor-pointer text-slate-300">
-                    <input type="checkbox" id="modal-bgp-peer-no-early-cut" class="rounded text-cyan-500 bg-slate-800 border-slate-700">
-                    <span>Prevent early cut on prefix withdrawal</span>
-                  </label>
-                </div>
-              </div>
-
-              <div class="grid grid-cols-3 items-center gap-3">
-                <label class="text-slate-400 font-medium">Keep Sent Attributes</label>
-                <div class="col-span-2">
-                  <label class="flex items-center gap-2 cursor-pointer text-slate-300">
-                    <input type="checkbox" id="modal-bgp-peer-keep-sent-attrs" class="rounded text-cyan-500 bg-slate-800 border-slate-700">
-                    <span>Retain outbound advertised attributes</span>
-                  </label>
-                </div>
-              </div>
-
-              <div class="grid grid-cols-3 items-center gap-3">
-                <label class="text-slate-400 font-medium">Affinities</label>
+                <label class="text-slate-400 font-medium">Timers (Seconds)</label>
                 <div class="col-span-2 grid grid-cols-2 gap-3">
                   <div>
-                    <span class="text-[10px] text-slate-500 block mb-0.5">Input Affinity</span>
-                    <input type="text" id="modal-bgp-peer-input-affinity" placeholder="none" class="w-full bg-slate-800 border border-slate-700 rounded-lg px-3 py-1 text-white font-mono">
+                    <span class="text-[10px] text-slate-500 block mb-0.5">Hold Time</span>
+                    <input type="text" id="modal-bgp-peer-holdtime" placeholder="30 (or 00:00:30)" class="w-full bg-slate-800 border border-slate-700 rounded-lg px-3 py-1 text-white font-mono">
                   </div>
                   <div>
-                    <span class="text-[10px] text-slate-500 block mb-0.5">Output Affinity</span>
-                    <input type="text" id="modal-bgp-peer-output-affinity" placeholder="none" class="w-full bg-slate-800 border border-slate-700 rounded-lg px-3 py-1 text-white font-mono">
+                    <span class="text-[10px] text-slate-500 block mb-0.5">Keepalive Time</span>
+                    <input type="text" id="modal-bgp-peer-keepalive" placeholder="10 (or 00:00:10)" class="w-full bg-slate-800 border border-slate-700 rounded-lg px-3 py-1 text-white font-mono">
                   </div>
                 </div>
               </div>
             </div>
 
-            <!-- TAB 3: ATTRIBUTES -->
-            <div id="bgp-peer-tab-attributes" class="space-y-3.5 hidden">
-              <div class="grid grid-cols-3 items-center gap-3">
-                <label class="text-slate-400 font-medium">Nexthop Choice</label>
-                <div class="col-span-2">
-                  <select id="modal-bgp-peer-nexthop-choice" class="w-full bg-slate-800 border border-slate-700 rounded-lg px-3 py-1.5 text-white font-mono">
-                    <option value="force-self">force-self (Next-hop Self)</option>
-                    <option value="default">default</option>
-                  </select>
-                </div>
-              </div>
+            <!-- TAB 2: ROUTING & FILTERS -->
+            <div id="bgp-peer-tab-filters" class="space-y-4 hidden">
+              <datalist id="filter-chains-list"></datalist>
 
-              <div class="grid grid-cols-3 items-center gap-3">
-                <label class="text-slate-400 font-medium">Default Prepend</label>
-                <div class="col-span-2">
-                  <input type="number" id="modal-bgp-peer-default-prepend" min="0" max="16" placeholder="0 (none)" class="w-full bg-slate-800 border border-slate-700 rounded-lg px-3 py-1.5 text-white font-mono">
-                  <p class="text-[10px] text-slate-500 mt-0.5">Repeat local ASN in AS-PATH to make path less preferred</p>
+              <div class="p-3 bg-slate-950/40 border border-slate-800 rounded-xl space-y-3">
+                <div class="font-bold text-white text-xs">Route Policy Filters</div>
+                <div class="grid grid-cols-3 items-center gap-3">
+                  <label class="text-slate-400 font-medium">In Filter</label>
+                  <div class="col-span-2">
+                    <input type="text" list="filter-chains-list" id="modal-bgp-peer-in-filter" placeholder="e.g. Internal, awmn" class="w-full bg-slate-800 border border-slate-700 rounded-lg px-3 py-1.5 text-white font-mono">
+                    <p class="text-[10px] text-slate-500 mt-0.5">Routing filter chain applied to routes received from this peer</p>
+                  </div>
                 </div>
-              </div>
 
-              <div class="grid grid-cols-3 items-center gap-3">
-                <label class="text-slate-400 font-medium">Allow AS In</label>
-                <div class="col-span-2">
-                  <input type="number" id="modal-bgp-peer-allow-as-in" min="0" max="10" placeholder="0" class="w-full bg-slate-800 border border-slate-700 rounded-lg px-3 py-1.5 text-white font-mono">
+                <div class="grid grid-cols-3 items-center gap-3">
+                  <label class="text-slate-400 font-medium">Out Filter</label>
+                  <div class="col-span-2">
+                    <input type="text" list="filter-chains-list" id="modal-bgp-peer-out-filter" placeholder="e.g. Internal, awmn" class="w-full bg-slate-800 border border-slate-700 rounded-lg px-3 py-1.5 text-white font-mono">
+                    <p class="text-[10px] text-slate-500 mt-0.5">Routing filter chain applied to routes exported to this peer</p>
+                  </div>
                 </div>
               </div>
 
-              <div class="grid grid-cols-3 items-center gap-3">
-                <label class="text-slate-400 font-medium">Ignore AS Path Length</label>
-                <div class="col-span-2">
-                  <label class="flex items-center gap-2 cursor-pointer text-slate-300">
-                    <input type="checkbox" id="modal-bgp-peer-ignore-as-path-len" class="rounded text-cyan-500 bg-slate-800 border-slate-700">
-                    <span>Ignore AS Path Length in route selection</span>
+              <div class="p-3 bg-slate-950/40 border border-slate-800 rounded-xl space-y-3">
+                <div class="font-bold text-white text-xs">Route Redistribution into BGP</div>
+                <p class="text-[11px] text-slate-400">Select which router routing sources should be announced to this peer session:</p>
+                <div class="space-y-2.5 text-slate-300">
+                  <label class="flex items-center gap-2.5 cursor-pointer">
+                    <input type="checkbox" id="modal-bgp-peer-redist-conn" class="rounded text-cyan-500 bg-slate-800 border-slate-700">
+                    <div>
+                      <span class="font-medium text-white">Redistribute Connected Subnets</span>
+                      <p class="text-[10px] text-slate-500">Announces directly attached interface networks (RTS_DEVICE)</p>
+                    </div>
                   </label>
-                </div>
-              </div>
-
-              <div class="grid grid-cols-3 items-center gap-3">
-                <label class="text-slate-400 font-medium">Remove Private AS</label>
-                <div class="col-span-2">
-                  <label class="flex items-center gap-2 cursor-pointer text-slate-300">
-                    <input type="checkbox" id="modal-bgp-peer-remove-priv-as" class="rounded text-cyan-500 bg-slate-800 border-slate-700">
-                    <span>Strip private AS numbers (64512-65534) from AS-PATH</span>
+                  <label class="flex items-center gap-2.5 cursor-pointer">
+                    <input type="checkbox" id="modal-bgp-peer-redist-static" checked class="rounded text-cyan-500 bg-slate-800 border-slate-700">
+                    <div>
+                      <span class="font-medium text-white">Redistribute Static Routes</span>
+                      <p class="text-[10px] text-slate-500">Announces kernel static routes and blackhole discard routes (distance 255)</p>
+                    </div>
                   </label>
-                </div>
-              </div>
-
-              <div class="grid grid-cols-3 items-center gap-3">
-                <label class="text-slate-400 font-medium">AS Override</label>
-                <div class="col-span-2">
-                  <label class="flex items-center gap-2 cursor-pointer text-slate-300">
-                    <input type="checkbox" id="modal-bgp-peer-as-override" class="rounded text-cyan-500 bg-slate-800 border-slate-700">
-                    <span>Replace peer AS in AS-PATH</span>
+                  <label class="flex items-center gap-2.5 cursor-pointer">
+                    <input type="checkbox" id="modal-bgp-peer-redist-ospf" class="rounded text-cyan-500 bg-slate-800 border-slate-700">
+                    <div>
+                      <span class="font-medium text-white">Redistribute OSPF Routes</span>
+                      <p class="text-[10px] text-slate-500">Announces routes learned from OSPF (RTS_OSPF)</p>
+                    </div>
                   </label>
-                </div>
-              </div>
-
-              <div class="grid grid-cols-3 items-center gap-3">
-                <label class="text-slate-400 font-medium">Cisco VPLS NLRI</label>
-                <div class="col-span-2">
-                  <label class="flex items-center gap-2 cursor-pointer text-slate-300">
-                    <input type="checkbox" id="modal-bgp-peer-vpls-nlri" class="rounded text-cyan-500 bg-slate-800 border-slate-700">
-                    <span>Cisco VPLS NLRI Length Format</span>
+                  <label class="flex items-center gap-2.5 cursor-pointer">
+                    <input type="checkbox" id="modal-bgp-peer-default-orig" class="rounded text-cyan-500 bg-slate-800 border-slate-700">
+                    <div>
+                      <span class="font-medium text-white">Default Originate (0.0.0.0/0)</span>
+                      <p class="text-[10px] text-slate-500">Always generate and announce a default gateway route to this peer</p>
+                    </div>
                   </label>
                 </div>
               </div>
             </div>
 
-            <!-- TAB 4: FILTER -->
-            <div id="bgp-peer-tab-filter" class="space-y-3.5 hidden">
-              <datalist id="filter-chains-list"></datalist>
-
-              <div class="grid grid-cols-3 items-center gap-3">
-                <label class="text-slate-400 font-medium">Input Filter</label>
-                <div class="col-span-2">
-                  <input type="text" list="filter-chains-list" id="modal-bgp-peer-in-filter" placeholder="e.g. awmn" class="w-full bg-slate-800 border border-slate-700 rounded-lg px-3 py-1.5 text-white font-mono">
-                  <p class="text-[10px] text-slate-500 mt-0.5">Routing Filter chain applied to incoming routes</p>
-                </div>
-              </div>
-
-              <div class="grid grid-cols-3 items-center gap-3">
-                <label class="text-slate-400 font-medium">Input Accept NLRI</label>
-                <div class="col-span-2">
-                  <input type="text" id="modal-bgp-peer-in-accept-nlri" placeholder="Optional NLRI prefixes" class="w-full bg-slate-800 border border-slate-700 rounded-lg px-3 py-1.5 text-white font-mono">
-                </div>
-              </div>
-
-              <div class="grid grid-cols-3 items-center gap-3">
-                <label class="text-slate-400 font-medium">Input Accept Communities</label>
-                <div class="col-span-2">
-                  <input type="text" id="modal-bgp-peer-in-accept-comm" placeholder="e.g. 65001:100" class="w-full bg-slate-800 border border-slate-700 rounded-lg px-3 py-1.5 text-white font-mono">
-                </div>
-              </div>
-
-              <div class="grid grid-cols-3 items-center gap-3">
-                <label class="text-slate-400 font-medium">Input Accept Ext Communities</label>
-                <div class="col-span-2">
-                  <input type="text" id="modal-bgp-peer-in-accept-ext-comm" placeholder="e.g. rt:65001:10" class="w-full bg-slate-800 border border-slate-700 rounded-lg px-3 py-1.5 text-white font-mono">
-                </div>
-              </div>
-
-              <div class="grid grid-cols-3 items-center gap-3">
-                <label class="text-slate-400 font-medium">Input Accept Large Communities</label>
-                <div class="col-span-2">
-                  <input type="text" id="modal-bgp-peer-in-accept-large-comm" placeholder="e.g. 65001:1:1" class="w-full bg-slate-800 border border-slate-700 rounded-lg px-3 py-1.5 text-white font-mono">
-                </div>
-              </div>
-
-              <div class="grid grid-cols-3 items-center gap-3">
-                <label class="text-slate-400 font-medium">Input Filter Communities</label>
-                <div class="col-span-2">
-                  <input type="text" id="modal-bgp-peer-in-filter-comm" placeholder="Filter pattern" class="w-full bg-slate-800 border border-slate-700 rounded-lg px-3 py-1.5 text-white font-mono">
-                </div>
-              </div>
-
-              <div class="grid grid-cols-3 items-center gap-3">
-                <label class="text-slate-400 font-medium">Input Filter Ext Communities</label>
-                <div class="col-span-2">
-                  <input type="text" id="modal-bgp-peer-in-filter-ext-comm" placeholder="Filter pattern" class="w-full bg-slate-800 border border-slate-700 rounded-lg px-3 py-1.5 text-white font-mono">
+            <!-- TAB 3: ADVERTISED NETWORKS -->
+            <div id="bgp-peer-tab-networks" class="space-y-4 hidden">
+              <div class="p-3 bg-purple-950/20 border border-purple-800/40 rounded-xl flex items-start gap-3">
+                <span class="text-purple-400 text-base">🛡️</span>
+                <div class="text-[11px] text-slate-300">
+                  <div class="font-semibold text-purple-300 mb-0.5">Blackhole Discard (Distance 255) Protection</div>
+                  Advertised networks listed here are announced directly to this peer. The router automatically installs a blackhole discard route with metric 255 in the Linux kernel routing table so your BGP daemon can reliably originate the prefix even if physical interfaces flap or subnets have unassigned addresses, eliminating packet bouncing and routing loops.
                 </div>
               </div>
 
-              <div class="grid grid-cols-3 items-center gap-3">
-                <label class="text-slate-400 font-medium">Input Filter Large Communities</label>
-                <div class="col-span-2">
-                  <input type="text" id="modal-bgp-peer-in-filter-large-comm" placeholder="Filter pattern" class="w-full bg-slate-800 border border-slate-700 rounded-lg px-3 py-1.5 text-white font-mono">
-                </div>
-              </div>
-
-              <div class="grid grid-cols-3 items-center gap-3">
-                <label class="text-slate-400 font-medium">Input Filter Unknown</label>
-                <div class="col-span-2">
-                  <label class="flex items-center gap-2 cursor-pointer text-slate-300">
-                    <input type="checkbox" id="modal-bgp-peer-in-filter-unknown" class="rounded text-cyan-500 bg-slate-800 border-slate-700">
-                    <span>Filter unknown BGP attributes</span>
-                  </label>
-                </div>
-              </div>
-
-              <hr class="border-slate-800/80 my-2">
-
-              <div class="grid grid-cols-3 items-center gap-3">
-                <label class="text-slate-400 font-medium">Output Filter</label>
-                <div class="col-span-2">
-                  <input type="text" list="filter-chains-list" id="modal-bgp-peer-out-filter" placeholder="e.g. awmn" class="w-full bg-slate-800 border border-slate-700 rounded-lg px-3 py-1.5 text-white font-mono">
-                  <p class="text-[10px] text-slate-500 mt-0.5">Routing Filter chain applied to outgoing routes</p>
-                </div>
-              </div>
-
-              <div class="grid grid-cols-3 items-center gap-3">
-                <label class="text-slate-400 font-medium">Output Selection Policy</label>
-                <div class="col-span-2">
-                  <select id="modal-bgp-peer-out-selection-policy" class="w-full bg-slate-800 border border-slate-700 rounded-lg px-3 py-1.5 text-white font-mono">
-                    <option value="disabled">disabled</option>
-                    <option value="passive">passive</option>
-                    <option value="force">force</option>
-                  </select>
-                </div>
-              </div>
-
-              <div class="grid grid-cols-3 items-center gap-3">
-                <label class="text-slate-400 font-medium">Output Network</label>
-                <div class="col-span-2">
-                  <input type="text" id="modal-bgp-peer-out-network-name" placeholder="e.g. BGP-AWMN" class="w-full bg-slate-800 border border-slate-700 rounded-lg px-3 py-1.5 text-white font-mono">
-                </div>
-              </div>
-
-              <hr class="border-slate-800/80 my-3">
-
-              <!-- Output Networks section with [+] and [-] buttons as requested! -->
               <div>
                 <div class="flex items-center justify-between mb-2">
                   <div>
@@ -9836,6 +9513,9 @@
       </div>
       <form id="bgp-network-form" onsubmit="submitBgpNetwork(event)" class="p-6 space-y-4 text-xs">
         <input type="hidden" id="modal-bgp-net-id">
+        <div class="p-2.5 rounded-lg bg-purple-950/30 border border-purple-800/40 text-[11px] text-purple-300">
+          <span class="font-bold">🛡️ Discard Route:</span> Advertised prefixes automatically maintain a kernel blackhole route with metric 255 so BGP originates the prefix reliably without routing loops.
+        </div>
         <div>
           <label class="block font-semibold text-slate-300 mb-1.5">Network Prefix (CIDR) *</label>
           <input type="text" id="modal-bgp-net-cidr" required placeholder="10.200.0.0/24" class="w-full bg-slate-800 border border-slate-700 rounded-lg px-3 py-2 text-white font-mono focus:outline-none focus:border-purple-500">