Fix FindBinder TypeId check for modern NS-3 compatibility

Sikabo · Sikabo · commit 7fdb862bb5c1 · 2026-01-09T13:34:17.000+01:00
Object::GetInstanceTypeId() cannot be overridden in modern NS-3, making
TypeId comparison always fail. Type safety ensured by dynamic_cast.

Signed-off-by: Anders Martinsson &lt;anders.martinsson@sikabo.com&gt;
diff --git a/model/local-socket-fd-factory.cc b/model/local-socket-fd-factory.cc
@@ -81,6 +81,7 @@ LocalSocketFdFactory::CreateSocket (int domain, int type, int protocol)
 LocalSocketFd*
 LocalSocketFdFactory::FindBinder (std::string path, TypeId type) const
 {
+  NS_LOG_FUNCTION (this << path << type.GetName());
   BindMap::const_iterator i = m_bindByPath.find (path);
   if (m_bindByPath.end () == i)
     {
@@ -89,7 +90,7 @@ LocalSocketFdFactory::FindBinder (std::string path, TypeId type) const
 
   LocalSocketFd* winner = i->second;
 
-  if ((winner != 0) && (winner->GetInstanceTypeId () == type))
+  if ((winner != 0))
     {
       return winner;
     }

Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,7 @@ LocalSocketFdFactory::CreateSocket (int domain, int type, int protocol)`
`81`	`81`	`LocalSocketFd*`
`82`	`82`	`LocalSocketFdFactory::FindBinder (std::string path, TypeId type) const`
`83`	`83`	`{`
	`84`	`+ NS_LOG_FUNCTION (this << path << type.GetName());`
`84`	`85`	`BindMap::const_iterator i = m_bindByPath.find (path);`
`85`	`86`	`if (m_bindByPath.end () == i)`
`86`	`87`	`{`
`@@ -89,7 +90,7 @@ LocalSocketFdFactory::FindBinder (std::string path, TypeId type) const`
`89`	`90`
`90`	`91`	`LocalSocketFd* winner = i->second;`
`91`	`92`
`92`		`- if ((winner != 0) && (winner->GetInstanceTypeId () == type))`
	`93`	`+ if ((winner != 0))`
`93`	`94`	`{`
`94`	`95`	`return winner;`
`95`	`96`	`}`