Jitsi Videobridge plugin: Incoming SIP calls now works. Tested ok with iNums

src/plugins/jitsivideobridge/src/java/org/ifsoft/sip/CallSession.java

@@ -156,6 +156,7 @@ public class CallSession
 		internalCallId = "CS" + String.format("%08x", nextInternalCallId++);
 
 		offerPayloads.add(PAYLOAD_PCMU);
+		answerPayloads.add(PAYLOAD_PCMU);
 
 		try {
 			InetAddress bindAddr = InetAddress.getByName(host);
@@ -794,6 +795,7 @@ public class CallSession
 								if (bitRatePayload != null)
 								{
 									Payload p = new Payload(codec, name, clockRate, bitRatePayload.bitRate);
+
 									if (offer)
 									{
 										offerPayloads.add(p);

src/plugins/jitsivideobridge/src/java/org/ifsoft/sip/SipService.java

@@ -133,7 +133,8 @@ public class SipService
 
 	public static String getLocalIP()
 	{
-		return localip;
+		ListeningPoint lp = sipProvider.getListeningPoint(ListeningPoint.UDP);
+		return lp.getIPAddress();
 	}
 
 	private void registerWithDefaultProxy()

src/plugins/jitsivideobridge/src/java/org/ifsoft/sip/VideoBridgeSipListener.java

@@ -485,15 +485,21 @@ public class VideoBridgeSipListener implements SipListener
 					if (cs != null)
 					{
 						Log.info("[[SIP]] created call session : [[" + cs.internalCallId + "]]");
-						cs.parseInvite(req, dialog, trans);
-						dialog.setApplicationData(cs);
 						Response res = SipService.messageFactory.createResponse(Response.RINGING, req);
 						trans.sendResponse(res);
 
+						cs.parseInvite(req, dialog, trans);
+						dialog.setApplicationData(cs);
 						SipService.acceptCall(cs);
-						return;
+
+					} else {
+
+						Response res = SipService.messageFactory.createResponse(Response.FORBIDDEN, req);
+						trans.sendResponse(res);
 					}
 
+					return;
+
 				} else {
 					// SIP RE-INVITE (dumbstart implementation, ignores timers, etc)
 					Log.info("[[SIP]] Got a re-invite!");

src/plugins/jitsivideobridge/src/java/org/jitsi/videobridge/openfire/PluginImpl.java

@@ -661,7 +661,11 @@ public class PluginImpl  implements Plugin, PropertyEventListener
 	{
 		CallSession session = null;
 		String hostname = XMPPServer.getInstance().getServerInfo().getHostname();
-		String focusAgentName = "jitsi.videobridge." + to;
+		String callerId = to;
+
+		if (callerId.indexOf("+") == 0) callerId = callerId.substring(1);
+
+		String focusAgentName = "jitsi.videobridge." + callerId;
 
 		if (sessions.containsKey(focusAgentName))
 		{
@@ -691,9 +695,6 @@ public class PluginImpl  implements Plugin, PropertyEventListener
 
 					session = new CallSession(mediaStream, hostname, focus, from);
 					focus.callSessions.put(to, session);
-
-					session.jabberRemote = to;
-					session.jabberLocal = from;
 				}
 			}
 		}