调整参数名称

648540858

2024-06-17 1909c7f71fc1b0e290678a3efe95b62d0b9df75e

 src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java

@@ -16,6 +16,9 @@
import org.springframework.util.ObjectUtils;

import javax.sip.*;
import java.net.Inet4Address;
import java.net.InetAddress;
import java.net.NetworkInterface;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;

@@ -36,19 +39,50 @@

   private final Map<String, SipProviderImpl> tcpSipProviderMap = new ConcurrentHashMap<>();
   private final Map<String, SipProviderImpl> udpSipProviderMap = new ConcurrentHashMap<>();
   private final List<String> monitorIps = new ArrayList<>();

   @Override
   public void run(String... args) {
      List<String> monitorIps = new ArrayList<>();
      // 使用逗号分割多个ip
      String separator = ",";
      if (sipConfig.getIp().indexOf(separator) > 0) {
         String[] split = sipConfig.getIp().split(separator);
         monitorIps.addAll(Arrays.asList(split));
      if (ObjectUtils.isEmpty(sipConfig.getIp())) {
         try {
            // 获得本机的所有网络接口
            Enumeration<NetworkInterface> nifs = NetworkInterface.getNetworkInterfaces();
            while (nifs.hasMoreElements()) {
               NetworkInterface nif = nifs.nextElement();
               // 获得与该网络接口绑定的 IP 地址，一般只有一个
               Enumeration<InetAddress> addresses = nif.getInetAddresses();
               while (addresses.hasMoreElements()) {
                  InetAddress addr = addresses.nextElement();
                  if (addr instanceof Inet4Address) {
                     if (addr.getHostAddress().equals("127.0.0.1")){
                        continue;
                     }
                     if (nif.getName().startsWith("docker")) {
                        continue;
                     }
                     logger.info("[自动配置SIP监听网卡] 网卡接口地址： {}", addr.getHostAddress());// 只关心 IPv4 地址
                     monitorIps.add(addr.getHostAddress());
                  }
               }
            }
         }catch (Exception e) {
            logger.error("[读取网卡信息失败]", e);
         }
         if (monitorIps.isEmpty()) {
            logger.error("[自动配置SIP监听网卡信息失败]， 请手动配置SIP.IP后重新启动");
            System.exit(1);
         }
      }else {
         monitorIps.add(sipConfig.getIp());
         // 使用逗号分割多个ip
         String separator = ",";
         if (sipConfig.getIp().indexOf(separator) > 0) {
            String[] split = sipConfig.getIp().split(separator);
            monitorIps.addAll(Arrays.asList(split));
         }else {
            monitorIps.add(sipConfig.getIp());
         }
      }

      sipConfig.setShowIp(String.join(",", monitorIps));
      SipFactory.getInstance().setPathName("gov.nist");
      if (monitorIps.size() > 0) {
         for (String monitorIp : monitorIps) {
@@ -108,6 +142,9 @@
      if (ObjectUtils.isEmpty(ip)) {
         return null;
      }
      if (udpSipProviderMap.size() == 1) {
         return udpSipProviderMap.values().stream().findFirst().get();
      }
      return udpSipProviderMap.get(ip);
   }

@@ -129,10 +166,16 @@
      if (ObjectUtils.isEmpty(ip)) {
         return null;
      }
      if (tcpSipProviderMap.size() == 1) {
         return tcpSipProviderMap.values().stream().findFirst().get();
      }
      return tcpSipProviderMap.get(ip);
   }

   public String getLocalIp(String deviceLocalIp) {
      if (monitorIps.size() == 1) {
         return monitorIps.get(0);
      }
      if (!ObjectUtils.isEmpty(deviceLocalIp)) {
         return deviceLocalIp;
      }