sipwise
/
jitsi
mirror of https://github.com/sipwise/jitsi.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix a problem when registering with sip TCP and creation of via and contact headers.

Browse Source 
Add latest patch from Grigorii Balutsel for Xcap, fixes NPE on wrong server URI.
cusax-fix
Damian Minkov 16 years ago
parent 2e3324bda8
commit 927b9738a2
4 changed files with 35 additions and 43 deletions
Show Stats Download Patch File Download Diff File

72
src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderServiceSipImpl.java
Unescape View File

@ -1077,22 +1077,22 @@ public ArrayList<ViaHeader> getLocalViaHeaders(SipURI intendedDestination)
= getListeningPoint(intendedDestination.getTransportParam());
try
{
InetSocketAddress targetAddress =
getIntendedDestination(intendedDestination);
InetAddress localAddress = SipActivator
.getNetworkAddressManagerService().getLocalHost(
getIntendedDestination(intendedDestination));
targetAddress.getAddress());
int localPort = srcListeningPoint.getPort();
String transport = srcListeningPoint.getTransport();
if (ListeningPoint.TCP.equalsIgnoreCase(transport))
//|| ListeningPoint.TLS.equalsIgnoreCase(transport)
{
int dstPort = intendedDestination.getPort();
if (dstPort == -1)
dstPort = 5060;
InetSocketAddress localSockAddr
= sipStackSharing.obtainLocalAddress(
NetworkUtils.getInetAddress(
intendedDestination.getHost()),
dstPort,
targetAddress.getAddress(),
targetAddress.getPort(),
localAddress);
localPort = localSockAddr.getPort();
}
@ -1138,7 +1138,7 @@ public ArrayList<ViaHeader> getLocalViaHeaders(SipURI intendedDestination)
throw new OperationFailedException(
"Unable to create a via header for port "
+ sipStackSharing.getLP(ListeningPoint.UDP).getPort()
,OperationFailedException.INTERNAL_ERROR
,OperationFailedException.NETWORK_FAILURE
,ex);
}
}
@ -1207,12 +1207,16 @@ public ContactHeader getContactHeader(SipURI intendedDestination)
ListeningPoint srcListeningPoint
= getListeningPoint(intendedDestination);
InetAddress targetAddress = getIntendedDestination(intendedDestination);
InetSocketAddress targetAddress =
getIntendedDestination(intendedDestination);
try
{
//find the address to use with the target
InetAddress localAddress = SipActivator
.getNetworkAddressManagerService().getLocalHost(targetAddress);
.getNetworkAddressManagerService()
.getLocalHost(targetAddress.getAddress());
SipURI contactURI = addressFactory.createSipURI(
getAccountID().getUserID()
@ -1226,24 +1230,12 @@ public ContactHeader getContactHeader(SipURI intendedDestination)
//if we are using tcp, make sure that we include the port of the
//socket that we are actually using and not that of LP
if (ListeningPoint.TCP.equalsIgnoreCase(transport))
//|| ListeningPoint.TLS.equalsIgnoreCase(transport))
{
InetAddress intendedDestinationAddress =
NetworkUtils.getInetAddress(intendedDestination.getHost());
int dstPort = intendedDestination.getPort();
// addresses are different it means we are using the outbound
// proxy we must use its port
if(!targetAddress.equals(intendedDestinationAddress) &&
getOutboundProxy() != null)
dstPort = getOutboundProxy().getPort();
if (dstPort == -1)
dstPort = 5060;
InetSocketAddress localSockAddr
= sipStackSharing.obtainLocalAddress(
targetAddress,
dstPort,
targetAddress.getAddress(),
targetAddress.getPort(),
localAddress);
localPort = localSockAddr.getPort();
}
@ -1752,11 +1744,11 @@ public Address getOurSipAddress(SipURI intendedDestination)
//we are apparently running in "No Registrar" mode so let's create an
//address by ourselves.
InetAddress destinationAddr
InetSocketAddress destinationAddr
= getIntendedDestination(intendedDestination);
InetAddress localHost = SipActivator.getNetworkAddressManagerService()
.getLocalHost(destinationAddr);
.getLocalHost(destinationAddr.getAddress());
String userID = getAccountID().getUserID();
@ -2606,13 +2598,13 @@ public InetSocketAddress resolveSipAddress(String address)
*
* @param destination the destination that we would contact.
*
* @return the <tt>InetAddress</tt> that is most likely to be to be used
* as a next hop when contacting the specified <tt>destination</tt>.
* @return the <tt>InetSocketAddress</tt> that is most likely to be to be
* used as a next hop when contacting the specified <tt>destination</tt>.
*
* @throws IllegalArgumentException if <tt>destination</tt> is not a valid
* host/ip/fqdn
*/
public InetAddress getIntendedDestination(Address destination)
public InetSocketAddress getIntendedDestination(Address destination)
throws IllegalArgumentException
{
return getIntendedDestination((SipURI)destination.getURI());
@ -2630,13 +2622,13 @@ public InetAddress getIntendedDestination(Address destination)
*
* @param destination the destination that we would contact.
*
* @return the <tt>InetAddress</tt> that is most likely to be to be used
* as a next hop when contacting the specified <tt>destination</tt>.
* @return the <tt>InetSocketAddress</tt> that is most likely to be to be
* used as a next hop when contacting the specified <tt>destination</tt>.
*
* @throws IllegalArgumentException if <tt>destination</tt> is not a valid
* host/ip/fqdn
*/
public InetAddress getIntendedDestination(SipURI destination)
public InetSocketAddress getIntendedDestination(SipURI destination)
throws IllegalArgumentException
{
return getIntendedDestination(destination.getHost());
@ -2653,17 +2645,17 @@ public InetAddress getIntendedDestination(SipURI destination)
*
* @param host the destination that we would contact.
*
* @return the <tt>InetAddress</tt> that is most likely to be to be used
* as a next hop when contacting the specified <tt>destination</tt>.
* @return the <tt>InetSocketAddress</tt> that is most likely to be to be
* used as a next hop when contacting the specified <tt>destination</tt>.
*
* @throws IllegalArgumentException if <tt>destination</tt> is not a valid
* host/ip/fqdn.
*/
public InetAddress getIntendedDestination(String host)
public InetSocketAddress getIntendedDestination(String host)
throws IllegalArgumentException
{
// Address
InetAddress destinationInetAddress = null;
InetSocketAddress destinationInetAddress = null;
//resolveSipAddress() verifies whether our destination is valid
//but the destination could only be known to our outbound proxy
@ -2675,13 +2667,13 @@ public InetAddress getIntendedDestination(String host)
{
if (logger.isTraceEnabled())
logger.trace("Will use proxy address");
destinationInetAddress = outboundProxy.getAddress();
destinationInetAddress = outboundProxy;
}
else
{
try
{
destinationInetAddress = resolveSipAddress(host).getAddress();
destinationInetAddress = resolveSipAddress(host);
}
catch (UnknownHostException ex)
{

2
src/net/java/sip/communicator/impl/protocol/sip/TransportManagerSipImpl.java
Unescape View File

@ -46,7 +46,7 @@ protected TransportManagerSipImpl(CallPeerSipImpl callPeer)
protected InetAddress getIntendedDestination(CallPeerSipImpl peer)
{
return peer.getProtocolProvider()
.getIntendedDestination(peer.getPeerAddress());
.getIntendedDestination(peer.getPeerAddress()).getAddress();
}
}

2
src/net/java/sip/communicator/impl/protocol/sip/xcap/XCapClientImpl.java
Unescape View File

@ -245,7 +245,7 @@ private XCapCapsType loadXCapCaps()
String xml = getResource(resourceId, XCapCapsClient.CONTENT_TYPE);
if (xml == null)
{
return new XCapCapsType();
throw new XCapException("Server xcap-caps wasn't find");
}
return XCapCapsParser.fromXml(xml);
}

2
src/net/java/sip/communicator/plugin/sipaccregwizz/PresencePanel.java
Unescape View File

@ -99,7 +99,7 @@ public PresencePanel(SIPAccountRegistrationForm regform)
Resources.getString("plugin.sipaccregwizz.XCAP_ENABLE"),
regform.getRegistration().isXCapEnable());
this.xCapUseSipCredetialsBox = new SIPCommCheckBox(
Resources.getString("plugin.sipaccregwizz.XCAP_USE_SIP_CREDETIALS"),
Resources.getString("plugin.sipaccregwizz.XCAP_USE_SIP_CREDENTIALS"),
regform.getRegistration().isXCapUseSipCredetials());
enablePresOpButton.addActionListener(new ActionListener()

Write Preview
Loading…
Cancel
Save