fix building without H.460.18

willamowius · willamowius · commit 4870634a36d0 · 2020-10-29T11:14:24.000+01:00
diff --git a/ProxyChannel.cxx b/ProxyChannel.cxx
@@ -3922,6 +3922,7 @@ void CallSignalSocket::ForwardCall(FacilityMsg * msg)
 		setupUUIE.m_destCallSignalAddress = oldDestSignalAddr;
 	}
 
+#ifdef HAS_H46018
     // remove or add H.460.19 fields in supportedFeatures
     if (!forwarded || forwarded->GetTraversalRole() == None) {
         // the receiver is probably not a H.460.19 client
@@ -3930,6 +3931,7 @@ void CallSignalSocket::ForwardCall(FacilityMsg * msg)
         RemoveH46019Descriptor(setupUUIE.m_supportedFeatures, senderSupportsH46019Multiplexing, isH46019Client);
     }
 	// TODO: also handle the case of forwarding to a H.460.18 endpoint
+#endif
 
 	if (Toolkit::AsBool(GkConfig()->GetString(RoutedSec, "ShowForwarderNumber", "0"))) {
 		if (endptr fwd = m_call->GetForwarder()) {

Original file line number	Diff line number	Diff line change
`@@ -3922,6 +3922,7 @@ void CallSignalSocket::ForwardCall(FacilityMsg * msg)`
`3922`	`3922`	`setupUUIE.m_destCallSignalAddress = oldDestSignalAddr;`
`3923`	`3923`	`}`
`3924`	`3924`
	`3925`	`+#ifdef HAS_H46018`
`3925`	`3926`	`// remove or add H.460.19 fields in supportedFeatures`
`3926`	`3927`	`if (!forwarded \|\| forwarded->GetTraversalRole() == None) {`
`3927`	`3928`	`// the receiver is probably not a H.460.19 client`
`@@ -3930,6 +3931,7 @@ void CallSignalSocket::ForwardCall(FacilityMsg * msg)`
`3930`	`3931`	`RemoveH46019Descriptor(setupUUIE.m_supportedFeatures, senderSupportsH46019Multiplexing, isH46019Client);`
`3931`	`3932`	`}`
`3932`	`3933`	`// TODO: also handle the case of forwarding to a H.460.18 endpoint`
	`3934`	`+#endif`
`3933`	`3935`
`3934`	`3936`	`if (Toolkit::AsBool(GkConfig()->GetString(RoutedSec, "ShowForwarderNumber", "0"))) {`
`3935`	`3937`	`if (endptr fwd = m_call->GetForwarder()) {`