diff --git a/doc/routing.md b/doc/routing.md
index 13573b454..e473ba854 100644
--- a/doc/routing.md
+++ b/doc/routing.md
@@ -131,6 +131,66 @@ an Ethernet interface can be done as follows.
admin@example:/config/routing/…/ospf/area/0.0.0.0/interface/e0/>
+
+### Point-to-Multipoint
+
+Point-to-Multipoint (P2MP) is used when multiple OSPF routers share a
+common network segment but should form individual adjacencies rather
+than electing a Designated Router (DR). This is common in NBMA-like
+environments, DMVPN, or hub-and-spoke topologies.
+
+Infix supports two P2MP variants via the `interface-type` setting:
+
+| **Interface Type** | **Behavior** |
+|:----------------------|:-----------------------------------------------|
+| `hybrid` | P2MP with multicast Hellos (broadcast-capable) |
+| `point-to-multipoint` | P2MP with unicast Hellos (non-broadcast) |
+
+#### Hybrid (broadcast-capable P2MP)
+
+Use `hybrid` when all neighbors on the segment can receive multicast.
+Hello packets are sent to the standard OSPF multicast address (224.0.0.5)
+and neighbors are discovered automatically — no manual neighbor
+configuration is needed.
+
+admin@example:/config/> edit routing control-plane-protocol ospfv2 name default ospf
+admin@example:/config/routing/…/ospf/> set area 0.0.0.0 interface e0 interface-type hybrid
+admin@example:/config/routing/…/ospf/> leave
+admin@example:/>
+admin@example:/config/> edit routing control-plane-protocol ospfv2 name default ospf
+admin@example:/config/routing/…/ospf/> set area 0.0.0.0 interface e0 interface-type point-to-multipoint
+admin@example:/config/routing/…/ospf/> leave
+admin@example:/>
+admin@example:/config/> edit routing control-plane-protocol ospfv2 name default ospf
+admin@example:/config/routing/…/ospf/> set area 0.0.0.0 interface e0 static-neighbors neighbor 10.0.123.2
+admin@example:/config/routing/…/ospf/> set area 0.0.0.0 interface e0 static-neighbors neighbor 10.0.123.3
+admin@example:/config/routing/…/ospf/> leave
+admin@example:/>
+ mgmt1 | data1 | \n\n\n\n | mgmt2 | mgmt3 | data2 }",
+ pos="20,30!",
+ requires="controller",
+ ];
+
+ R1 [
+ label="{ mgmt | data | link1 | mgmt | link2 } | R2 \n 10.0.2.1/32 \n(lo) \n(br0: 10.0.123.2/24)",
+ pos="160,30!",
+ requires="infix",
+ ];
+ R3 [
+ label="{ mgmt | data } | R3 \n 10.0.3.1/32 \n(lo)",
+ pos="160,0!",
+ requires="infix",
+ ];
+
+ PC:mgmt1 -- R1:mgmt [requires="mgmt", color="lightgray"]
+ PC:mgmt2 -- R2:mgmt [requires="mgmt", color="lightgray"]
+ PC:mgmt3 -- R3:mgmt [requires="mgmt", color="lightgray"]
+ PC:data1 -- R1:data [taillabel="10.0.10.2/24", headlabel="10.0.10.1/24"]
+ R3:data -- PC:data2 [taillabel="10.0.30.1/24", headlabel="10.0.30.2/24"]
+ R1:link -- R2:link1 [taillabel="10.0.123.1/24"]
+ R3:link -- R2:link2 [taillabel="10.0.123.3/24"]
+}
diff --git a/test/case/routing/ospf_point_to_multipoint_hybrid/__pycache__/test.cpython-312.pyc b/test/case/routing/ospf_point_to_multipoint_hybrid/__pycache__/test.cpython-312.pyc
new file mode 100644
index 000000000..0729f22e0
Binary files /dev/null and b/test/case/routing/ospf_point_to_multipoint_hybrid/__pycache__/test.cpython-312.pyc differ
diff --git a/test/case/routing/ospf_point_to_multipoint_hybrid/test.py b/test/case/routing/ospf_point_to_multipoint_hybrid/test.py
new file mode 100755
index 000000000..f067ad832
--- /dev/null
+++ b/test/case/routing/ospf_point_to_multipoint_hybrid/test.py
@@ -0,0 +1,334 @@
+#!/usr/bin/env python3
+"""OSPF Point-to-Multipoint Hybrid
+
+Verify OSPF point-to-multipoint hybrid (broadcast) interface type by
+configuring three routers on a shared multi-access network with the
+ietf-ospf 'hybrid' interface type. This maps to FRR's 'point-to-multipoint'
+network type, which uses multicast for neighbor discovery.
+
+R2 acts as the hub, bridging two physical links (link1, link2) into a
+single broadcast domain (br0). R1 and R3 each connect to one of R2's
+ports. The test verifies that all routers form OSPF adjacencies, exchange
+routes, and that the interface type is correctly reported as hybrid.
+
+....
+ +------------------+ +------------------+
+ | R1 | | R3 |
+ | 10.0.1.1/32 | | 10.0.3.1/32 |
+ | (lo) | | (lo) |
+ +--------+---------+ +--------+---------+
+ | .1 | .3
+ | +------------------+ |
+ +----link1------+ R2 +------link2--------+
+ | 10.0.2.1/32 |
+ | (lo) |
+ | br0: 10.0.123.2 |
+ +------------------+
+ 10.0.123.0/24
+ (P2MP hybrid / shared segment)
+....
+"""
+
+import infamy
+import infamy.route as route
+from infamy.util import until, parallel
+
+
+def config_target1(target, link, data):
+ target.put_config_dicts({
+ "ietf-interfaces": {
+ "interfaces": {
+ "interface": [
+ {
+ "name": link,
+ "enabled": True,
+ "ipv4": {
+ "forwarding": True,
+ "address": [{
+ "ip": "10.0.123.1",
+ "prefix-length": 24
+ }]
+ }
+ },
+ {
+ "name": data,
+ "enabled": True,
+ "ipv4": {
+ "forwarding": True,
+ "address": [{
+ "ip": "10.0.10.1",
+ "prefix-length": 24
+ }]
+ }
+ },
+ {
+ "name": "lo",
+ "enabled": True,
+ "ipv4": {
+ "address": [{
+ "ip": "10.0.1.1",
+ "prefix-length": 32
+ }]
+ }
+ }
+ ]
+ }
+ },
+ "ietf-system": {
+ "system": {
+ "hostname": "R1"
+ }
+ },
+ "ietf-routing": {
+ "routing": {
+ "control-plane-protocols": {
+ "control-plane-protocol": [{
+ "type": "infix-routing:ospfv2",
+ "name": "default",
+ "ospf": {
+ "redistribute": {
+ "redistribute": [{
+ "protocol": "connected"
+ }]
+ },
+ "areas": {
+ "area": [{
+ "area-id": "0.0.0.0",
+ "interfaces": {
+ "interface": [{
+ "name": link,
+ "enabled": True,
+ "interface-type": "hybrid",
+ "hello-interval": 1,
+ "dead-interval": 3
+ }, {
+ "name": "lo",
+ "enabled": True
+ }]
+ }
+ }]
+ }
+ }
+ }]
+ }
+ }
+ }
+ })
+
+
+def config_target2(target, link1, link2):
+ target.put_config_dicts({
+ "ietf-interfaces": {
+ "interfaces": {
+ "interface": [
+ {
+ "name": "br0",
+ "type": "infix-if-type:bridge",
+ "enabled": True,
+ "ipv4": {
+ "forwarding": True,
+ "address": [{
+ "ip": "10.0.123.2",
+ "prefix-length": 24
+ }]
+ }
+ },
+ {
+ "name": link1,
+ "enabled": True,
+ "infix-interfaces:bridge-port": {
+ "bridge": "br0"
+ }
+ },
+ {
+ "name": link2,
+ "enabled": True,
+ "infix-interfaces:bridge-port": {
+ "bridge": "br0"
+ }
+ },
+ {
+ "name": "lo",
+ "enabled": True,
+ "ipv4": {
+ "address": [{
+ "ip": "10.0.2.1",
+ "prefix-length": 32
+ }]
+ }
+ }
+ ]
+ }
+ },
+ "ietf-system": {
+ "system": {
+ "hostname": "R2"
+ }
+ },
+ "ietf-routing": {
+ "routing": {
+ "control-plane-protocols": {
+ "control-plane-protocol": [{
+ "type": "infix-routing:ospfv2",
+ "name": "default",
+ "ospf": {
+ "redistribute": {
+ "redistribute": [{
+ "protocol": "connected"
+ }]
+ },
+ "areas": {
+ "area": [{
+ "area-id": "0.0.0.0",
+ "interfaces": {
+ "interface": [{
+ "name": "br0",
+ "enabled": True,
+ "interface-type": "hybrid",
+ "hello-interval": 1,
+ "dead-interval": 3
+ }, {
+ "name": "lo",
+ "enabled": True
+ }]
+ }
+ }]
+ }
+ }
+ }]
+ }
+ }
+ }
+ })
+
+
+def config_target3(target, link, data):
+ target.put_config_dicts({
+ "ietf-interfaces": {
+ "interfaces": {
+ "interface": [
+ {
+ "name": link,
+ "enabled": True,
+ "ipv4": {
+ "forwarding": True,
+ "address": [{
+ "ip": "10.0.123.3",
+ "prefix-length": 24
+ }]
+ }
+ },
+ {
+ "name": data,
+ "enabled": True,
+ "ipv4": {
+ "forwarding": True,
+ "address": [{
+ "ip": "10.0.30.1",
+ "prefix-length": 24
+ }]
+ }
+ },
+ {
+ "name": "lo",
+ "enabled": True,
+ "ipv4": {
+ "address": [{
+ "ip": "10.0.3.1",
+ "prefix-length": 32
+ }]
+ }
+ }
+ ]
+ }
+ },
+ "ietf-system": {
+ "system": {
+ "hostname": "R3"
+ }
+ },
+ "ietf-routing": {
+ "routing": {
+ "control-plane-protocols": {
+ "control-plane-protocol": [{
+ "type": "infix-routing:ospfv2",
+ "name": "default",
+ "ospf": {
+ "redistribute": {
+ "redistribute": [{
+ "protocol": "connected"
+ }]
+ },
+ "areas": {
+ "area": [{
+ "area-id": "0.0.0.0",
+ "interfaces": {
+ "interface": [{
+ "name": link,
+ "enabled": True,
+ "interface-type": "hybrid",
+ "hello-interval": 1,
+ "dead-interval": 3
+ }, {
+ "name": "lo",
+ "enabled": True
+ }]
+ }
+ }]
+ }
+ }
+ }]
+ }
+ }
+ }
+ })
+
+
+with infamy.Test() as test:
+ with test.step("Set up topology and attach to target DUTs"):
+ env = infamy.Env()
+ R1 = env.attach("R1", "mgmt")
+ R2 = env.attach("R2", "mgmt")
+ R3 = env.attach("R3", "mgmt")
+
+ with test.step("Configure targets"):
+ _, R1link = env.ltop.xlate("R1", "link")
+ _, R1data = env.ltop.xlate("R1", "data")
+ _, R2link1 = env.ltop.xlate("R2", "link1")
+ _, R2link2 = env.ltop.xlate("R2", "link2")
+ _, R3link = env.ltop.xlate("R3", "link")
+ _, R3data = env.ltop.xlate("R3", "data")
+
+ parallel(config_target1(R1, R1link, R1data),
+ config_target2(R2, R2link1, R2link2),
+ config_target3(R3, R3link, R3data))
+
+ with test.step("Wait for OSPF routes"):
+ print("Waiting for OSPF routes to converge")
+ until(lambda: route.ipv4_route_exist(R1, "10.0.2.1/32", proto="ietf-ospf:ospfv2"), attempts=200)
+ until(lambda: route.ipv4_route_exist(R1, "10.0.3.1/32", proto="ietf-ospf:ospfv2"), attempts=200)
+ until(lambda: route.ipv4_route_exist(R2, "10.0.1.1/32", proto="ietf-ospf:ospfv2"), attempts=200)
+ until(lambda: route.ipv4_route_exist(R2, "10.0.3.1/32", proto="ietf-ospf:ospfv2"), attempts=200)
+ until(lambda: route.ipv4_route_exist(R3, "10.0.1.1/32", proto="ietf-ospf:ospfv2"), attempts=200)
+ until(lambda: route.ipv4_route_exist(R3, "10.0.2.1/32", proto="ietf-ospf:ospfv2"), attempts=200)
+
+ with test.step("Verify interface type is hybrid"):
+ print("Checking OSPF interface type on all routers")
+ assert route.ospf_get_interface_type(R1, "0.0.0.0", R1link) == "hybrid"
+ assert route.ospf_get_interface_type(R2, "0.0.0.0", "br0") == "hybrid"
+ assert route.ospf_get_interface_type(R3, "0.0.0.0", R3link) == "hybrid"
+
+ with test.step("Verify connectivity between all DUTs"):
+ _, hport1 = env.ltop.xlate("PC", "data1")
+ _, hport2 = env.ltop.xlate("PC", "data2")
+ with infamy.IsolatedMacVlan(hport1) as ns1, \
+ infamy.IsolatedMacVlan(hport2) as ns2:
+ ns1.addip("10.0.10.2")
+ ns2.addip("10.0.30.2")
+ ns1.addroute("10.0.3.1/32", "10.0.10.1")
+ ns2.addroute("10.0.1.1/32", "10.0.30.1")
+ parallel(
+ lambda: ns1.must_reach("10.0.3.1"),
+ lambda: ns2.must_reach("10.0.1.1"),
+ )
+ test.succeed()
diff --git a/test/case/routing/ospf_point_to_multipoint_hybrid/topology.dot b/test/case/routing/ospf_point_to_multipoint_hybrid/topology.dot
new file mode 100644
index 000000000..6a345571c
--- /dev/null
+++ b/test/case/routing/ospf_point_to_multipoint_hybrid/topology.dot
@@ -0,0 +1,39 @@
+graph "3r-p2mp" {
+ layout="neato";
+ overlap="false";
+ esep="+20";
+ size=10
+
+ node [shape=record, fontname="DejaVu Sans Mono, Book"];
+ edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"];
+
+ PC [
+ label="PC | { mgmt1 | data1 | \n\n\n\n | mgmt2 | mgmt3 | data2 }",
+ pos="20,30!",
+ requires="controller",
+ ];
+
+ R1 [
+ label="{ mgmt | data | link1 | mgmt | link2 } | R2 \n 10.0.2.1/32 \n(lo) \n(br0: 10.0.123.2/24)",
+ pos="160,30!",
+ requires="infix",
+ ];
+ R3 [
+ label="{ mgmt | data } | R3 \n 10.0.3.1/32 \n(lo)",
+ pos="160,0!",
+ requires="infix",
+ ];
+
+ PC:mgmt1 -- R1:mgmt [requires="mgmt", color="lightgray"]
+ PC:mgmt2 -- R2:mgmt [requires="mgmt", color="lightgray"]
+ PC:mgmt3 -- R3:mgmt [requires="mgmt", color="lightgray"]
+ PC:data1 -- R1:data [taillabel="10.0.10.2/24", headlabel="10.0.10.1/24"]
+ R3:data -- PC:data2 [taillabel="10.0.30.1/24", headlabel="10.0.30.2/24"]
+ R1:link -- R2:link1 [taillabel="10.0.123.1/24"]
+ R3:link -- R2:link2 [taillabel="10.0.123.3/24"]
+}