wvp-pro.git - Gitblit

			@@ -27,6 +27,9 @@
			import org.springframework.stereotype.Component;
			import org.springframework.util.ObjectUtils;

			import javax.sip.*;
			import javax.sip.header.*;
			import javax.sip.message.Request;
			import javax.sip.RequestEvent;
			import javax.sip.SipException;
			import javax.sip.header.AuthorizationHeader;
			@@ -80,7 +83,6 @@
			public void process(RequestEvent evt) {
			try {
			RequestEventExt evtExt = (RequestEventExt) evt;
			String requestAddress = evtExt.getRemoteIpAddress() + ":" + evtExt.getRemotePort();

			SIPRequest request = (SIPRequest)evt.getRequest();
			Response response = null;
			@@ -91,12 +93,13 @@
			AddressImpl address = (AddressImpl) fromHeader.getAddress();
			SipUri uri = (SipUri) address.getURI();
			String deviceId = uri.getUser();
			logger.info("[注册请求] 设备：{}, 开始处理: {}", deviceId, requestAddress);

			Device device = deviceService.getDevice(deviceId);

			RemoteAddressInfo remoteAddressInfo = SipUtils.getRemoteAddressFromRequest(request,
			userSetting.getSipUseSourceIpAsRemoteAddress());
			logger.info("[注册请求] 设备：{}, 远程地址为: {}:{}", deviceId, remoteAddressInfo.getIp(), remoteAddressInfo.getPort());
			String requestAddress = remoteAddressInfo.getIp() + ":" + remoteAddressInfo.getPort();
			logger.info("[注册请求] 设备：{}, 开始处理: {}", deviceId, requestAddress);
			if (device != null &&
			device.getSipTransactionInfo() != null &&
			request.getCallIdHeader().getCallId().equals(device.getSipTransactionInfo().getCallId())) {
			@@ -164,9 +167,8 @@
			device.setStreamMode("UDP");
			device.setCharset("GB2312");
			device.setGeoCoordSys("WGS84");
			device.setTreeType("CivilCode");
			device.setDeviceId(deviceId);
			device.setOnline(0);
			device.setOnLine(false);
			}
			device.setIp(remoteAddressInfo.getIp());
			device.setPort(remoteAddressInfo.getPort());