Segfault fixed when relay interface was defined without interface-id.

CHANGELOG

@@ -4,6 +4,7 @@
 
 0.8.1 [not-released-yet]
   - Fixed socket binding problem on server that may affect relay scenarios
+  - Fixed segmentation fault when interface-id was not defined on relay interface.
 
 0.8.0 [2011-05-11]
   - Fixed compilation problems

Options/OptVendorSpecInfo.cpp

@@ -22,7 +22,7 @@
 TOptVendorSpecInfo::TOptVendorSpecInfo(int type, char * buf,  int n, TMsg* parent)
     :TOpt(type, parent)
 {
-    int optionCode, optionLen;
+    int optionCode = 0, optionLen = 0;
     if (n<4) {
 	Log(Error) << "Unable to parse truncated vendor-spec info option." << LogEnd;
 	this->Vendor = 0;

SrvCfgMgr/SrvCfgIface.cpp

@@ -670,8 +670,13 @@ ostream& operator<<(ostream& out,TSrvCfgIface& iface) {
     out << "  <SrvCfgIface name=\""<<iface.Name << "\" ifindex=\""<<iface.ID << "\">" << endl;
 
     if (iface.Relay) {
-	out << "    <relay name=\"" << iface.RelayName << "\" ifindex=\"" << iface.RelayID << "\" interfaceid=\""
-	    << iface.RelayInterfaceID->getPlain() << "\"/>" << std::endl;
+        out << "    <relay name=\"" << iface.RelayName << "\" ifindex=\"" << iface.RelayID;
+	if (iface.RelayInterfaceID) {
+	  out << "\" interfaceid=\"" << iface.RelayInterfaceID->getPlain() << "\"";
+	} else {
+	  out << "\" interfaceid=null";
+	}
+	out << "/>" << std::endl;
     } else {
 	out << "    <!-- <relay/> -->" << std::endl;
     }

SrvIfaceMgr/SrvIfaceIface.cpp

@@ -106,8 +106,12 @@ ostream & operator <<(ostream & strum, TSrvIfaceIface &x) {
     if (x.RelaysCnt) {
 	for (i=0; i< x.RelaysCnt; i++) {
 	    strum << "    <OverlayingRelay name=\"" << x.Relays[i].iface->getName() 
-		  << "\" ifindex=\"" << x.Relays[i].ifindex 
-		  << "\" interfaceID=\"" << x.Relays[i].interfaceID->getPlain() << "\" />" << endl;
+		  << "\" ifindex=\"" << x.Relays[i].ifindex;
+	    if (x.Relays[i].interfaceID)
+	      strum << "\" interfaceID=\"" << x.Relays[i].interfaceID->getPlain();
+	    else
+	      strum << "\" interfaceID=null\"";
+	    strum << "\" />" << endl;
 	}
     }
 

client-addrparams.conf

@@ -18,11 +18,11 @@ experimental
 iface "eth0" 
 {
   ia
-  { 
+  {
      // address-parameters contain information about prefix length, so client
      // will ask for it. If server supports it too, addr-params option will be
      // granted.
-     addr-params 
+     addr-params
   }
-  
+
 }