From 6968839f21fb05bf6e3204c2040ee47130006cd0 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期日, 27 十二月 2020 08:19:34 +0800
Subject: [PATCH] 修复空指针异常
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorFactory.java | 110 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 91 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorFactory.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorFactory.java
index a211b6e..d37259a 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorFactory.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorFactory.java
@@ -2,13 +2,27 @@
import javax.sip.RequestEvent;
import javax.sip.ResponseEvent;
+import javax.sip.SipProvider;
import javax.sip.header.CSeqHeader;
+import javax.sip.header.CallIdHeader;
+import javax.sip.header.Header;
import javax.sip.message.Request;
import javax.sip.message.Response;
+import com.alibaba.fastjson.JSON;
+import com.genersoft.iot.vmp.gb28181.event.SipSubscribe;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Component;
+import com.genersoft.iot.vmp.conf.SipConfig;
+import com.genersoft.iot.vmp.gb28181.auth.RegisterLogicHandler;
+import com.genersoft.iot.vmp.gb28181.event.DeviceOffLineDetector;
+import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
+import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
+import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
import com.genersoft.iot.vmp.gb28181.transmit.request.ISIPRequestProcessor;
import com.genersoft.iot.vmp.gb28181.transmit.request.impl.AckRequestProcessor;
import com.genersoft.iot.vmp.gb28181.transmit.request.impl.ByeRequestProcessor;
@@ -23,6 +37,9 @@
import com.genersoft.iot.vmp.gb28181.transmit.response.impl.CancelResponseProcessor;
import com.genersoft.iot.vmp.gb28181.transmit.response.impl.InviteResponseProcessor;
import com.genersoft.iot.vmp.gb28181.transmit.response.impl.OtherResponseProcessor;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
+import com.genersoft.iot.vmp.utils.SpringBeanFactory;
+import com.genersoft.iot.vmp.utils.redis.RedisUtil;
/**
* @Description:TODO(杩欓噷鐢ㄤ竴鍙ヨ瘽鎻忚堪杩欎釜绫荤殑浣滅敤)
@@ -32,29 +49,31 @@
@Component
public class SIPProcessorFactory {
- @Autowired
- private InviteRequestProcessor inviteRequestProcessor;
+ private final static Logger logger = LoggerFactory.getLogger(SIPProcessorFactory.class);
@Autowired
- private RegisterRequestProcessor registerRequestProcessor;
+ private SipConfig sipConfig;
@Autowired
- private SubscribeRequestProcessor subscribeRequestProcessor;
+ private RegisterLogicHandler handler;
@Autowired
- private AckRequestProcessor ackRequestProcessor;
+ private IVideoManagerStorager storager;
@Autowired
- private ByeRequestProcessor byeRequestProcessor;
+ private EventPublisher publisher;
@Autowired
- private CancelRequestProcessor cancelRequestProcessor;
+ private SIPCommander cmder;
@Autowired
- private MessageRequestProcessor messageRequestProcessor;
+ private RedisUtil redis;
@Autowired
- private OtherRequestProcessor otherRequestProcessor;
+ private DeferredResultHolder deferredResultHolder;
+
+ @Autowired
+ private DeviceOffLineDetector offLineDetector;
@Autowired
private InviteResponseProcessor inviteResponseProcessor;
@@ -67,32 +86,71 @@
@Autowired
private OtherResponseProcessor otherResponseProcessor;
-
+
+
+ // 娉細杩欓噷浣跨敤娉ㄨВ浼氬鑷村惊鐜緷璧栨敞鍏ワ紝鏆傜敤springBean
+ private SipProvider tcpSipProvider;
+
+ // 娉細杩欓噷浣跨敤娉ㄨВ浼氬鑷村惊鐜緷璧栨敞鍏ワ紝鏆傜敤springBean
+ private SipProvider udpSipProvider;
public ISIPRequestProcessor createRequestProcessor(RequestEvent evt) {
Request request = evt.getRequest();
String method = request.getMethod();
-
+// logger.info("鎺ユ敹鍒版秷鎭細"+request.getMethod());
+// sipSubscribe.getSubscribe(evt.getServerTransaction().getBranchId()).response(evt);
if (Request.INVITE.equals(method)) {
- return inviteRequestProcessor;
+ InviteRequestProcessor processor = new InviteRequestProcessor();
+ processor.setRequestEvent(evt);
+ processor.setTcpSipProvider(getTcpSipProvider());
+ processor.setUdpSipProvider(getUdpSipProvider());
+ return processor;
} else if (Request.REGISTER.equals(method)) {
- return registerRequestProcessor;
+ RegisterRequestProcessor processor = new RegisterRequestProcessor();
+ processor.setRequestEvent(evt);
+ processor.setTcpSipProvider(getTcpSipProvider());
+ processor.setUdpSipProvider(getUdpSipProvider());
+ processor.setHandler(handler);
+ processor.setPublisher(publisher);
+ processor.setSipConfig(sipConfig);
+ processor.setVideoManagerStorager(storager);
+ return processor;
} else if (Request.SUBSCRIBE.equals(method)) {
- return subscribeRequestProcessor;
+ SubscribeRequestProcessor processor = new SubscribeRequestProcessor();
+ processor.setRequestEvent(evt);
+ return processor;
} else if (Request.ACK.equals(method)) {
- return ackRequestProcessor;
+ AckRequestProcessor processor = new AckRequestProcessor();
+ processor.setRequestEvent(evt);
+ return processor;
} else if (Request.BYE.equals(method)) {
- return byeRequestProcessor;
+ ByeRequestProcessor processor = new ByeRequestProcessor();
+ processor.setRequestEvent(evt);
+ return processor;
} else if (Request.CANCEL.equals(method)) {
- return cancelRequestProcessor;
+ CancelRequestProcessor processor = new CancelRequestProcessor();
+ processor.setRequestEvent(evt);
+ return processor;
} else if (Request.MESSAGE.equals(method)) {
- return messageRequestProcessor;
+
+ MessageRequestProcessor processor = new MessageRequestProcessor();
+ processor.setRequestEvent(evt);
+ processor.setTcpSipProvider(getTcpSipProvider());
+ processor.setUdpSipProvider(getUdpSipProvider());
+ processor.setPublisher(publisher);
+ processor.setRedis(redis);
+ processor.setDeferredResultHolder(deferredResultHolder);
+ processor.setOffLineDetector(offLineDetector);
+ processor.setCmder(cmder);
+ processor.setStorager(storager);
+ return processor;
} else {
- return otherRequestProcessor;
+ return new OtherRequestProcessor();
}
}
public ISIPResponseProcessor createResponseProcessor(ResponseEvent evt) {
+
Response response = evt.getResponse();
CSeqHeader cseqHeader = (CSeqHeader) response.getHeader(CSeqHeader.NAME);
String method = cseqHeader.getMethod();
@@ -107,4 +165,18 @@
}
}
+ private SipProvider getTcpSipProvider() {
+ if (tcpSipProvider == null) {
+ tcpSipProvider = (SipProvider) SpringBeanFactory.getBean("tcpSipProvider");
+ }
+ return tcpSipProvider;
+ }
+
+ private SipProvider getUdpSipProvider() {
+ if (udpSipProvider == null) {
+ udpSipProvider = (SipProvider) SpringBeanFactory.getBean("udpSipProvider");
+ }
+ return udpSipProvider;
+ }
+
}
--
Gitblit v1.8.0