|
|
@@ -8,6 +8,7 @@ import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.context.annotation.Bean;
|
|
|
+import org.springframework.context.annotation.Configuration;
|
|
|
import org.springframework.context.annotation.DependsOn;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
|
@@ -18,7 +19,7 @@ import java.util.concurrent.LinkedBlockingQueue;
|
|
|
import java.util.concurrent.ThreadPoolExecutor;
|
|
|
import java.util.concurrent.TimeUnit;
|
|
|
|
|
|
-@Component
|
|
|
+@Configuration
|
|
|
public class SipLayer{
|
|
|
|
|
|
private final static Logger logger = LoggerFactory.getLogger(SipLayer.class);
|
|
|
@@ -35,7 +36,7 @@ public class SipLayer{
|
|
|
|
|
|
|
|
|
@Bean("sipFactory")
|
|
|
- private SipFactory createSipFactory() {
|
|
|
+ SipFactory createSipFactory() {
|
|
|
sipFactory = SipFactory.getInstance();
|
|
|
sipFactory.setPathName("gov.nist");
|
|
|
return sipFactory;
|
|
|
@@ -43,7 +44,7 @@ public class SipLayer{
|
|
|
|
|
|
@Bean("sipStack")
|
|
|
@DependsOn({"sipFactory"})
|
|
|
- private SipStack createSipStack() throws PeerUnavailableException {
|
|
|
+ SipStack createSipStack() throws PeerUnavailableException {
|
|
|
Properties properties = new Properties();
|
|
|
properties.setProperty("javax.sip.STACK_NAME", "GB28181_SIP");
|
|
|
properties.setProperty("javax.sip.IP_ADDRESS", sipConfig.getMonitorIp());
|
|
|
@@ -64,7 +65,7 @@ public class SipLayer{
|
|
|
|
|
|
@Bean(name = "tcpSipProvider")
|
|
|
@DependsOn("sipStack")
|
|
|
- private SipProviderImpl startTcpListener() {
|
|
|
+ SipProviderImpl startTcpListener() {
|
|
|
ListeningPoint tcpListeningPoint = null;
|
|
|
SipProviderImpl tcpSipProvider = null;
|
|
|
try {
|
|
|
@@ -89,7 +90,7 @@ public class SipLayer{
|
|
|
|
|
|
@Bean(name = "udpSipProvider")
|
|
|
@DependsOn("sipStack")
|
|
|
- private SipProviderImpl startUdpListener() {
|
|
|
+ SipProviderImpl startUdpListener() {
|
|
|
ListeningPoint udpListeningPoint = null;
|
|
|
SipProviderImpl udpSipProvider = null;
|
|
|
try {
|
648540858