From b34139c7138be5111c258c2dd67583c8be2808ff Mon Sep 17 00:00:00 2001 From: zhangwei Date: Tue, 3 Jul 2018 09:47:32 +0800 Subject: [PATCH] =?UTF-8?q?IP=E8=BD=AC=E6=8D=A2=E6=97=B6=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9IP=E7=B1=BB=E5=9E=8B=E4=B8=BA46=E6=88=96=E8=80=8564?= =?UTF-8?q?=E6=97=B6=E7=9A=84=E6=BA=90=E7=9B=AE=E7=9A=84IP=E7=BC=BA?= =?UTF-8?q?=E7=9C=81=E5=80=BC=EF=BC=8C46=E8=A1=A8=E7=A4=BA=E6=BA=90ip?= =?UTF-8?q?=E4=B8=BAipv4=EF=BC=8C=E7=9B=AE=E7=9A=84ip=E4=B8=BAipv6?= =?UTF-8?q?=EF=BC=8C64=E8=A1=A8=E7=A4=BA=E6=BA=90ip=E4=B8=BAipv6=EF=BC=8C?= =?UTF-8?q?=E7=9B=AE=E7=9A=84ip=E4=B8=BAipv4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangwei --- .../java/com/nis/web/service/BaseService.java | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/nis/web/service/BaseService.java b/src/main/java/com/nis/web/service/BaseService.java index 1ff185f6b..8a17117a7 100644 --- a/src/main/java/com/nis/web/service/BaseService.java +++ b/src/main/java/com/nis/web/service/BaseService.java @@ -388,21 +388,21 @@ public abstract class BaseService { public static IpCfg ipConvert(IpCfg dstIp,BaseIpCfg srcIp){ if(srcIp.getSrcIpAddress()!=null){ if(srcIp.getSrcIpAddress().indexOf("/")!=-1){ - if(srcIp.getIpType()==4 || srcIp.getIpType()==46){ + if(srcIp.getIpType()==4 || srcIp.getIpType()==46){//46表示源ip为ipv4，目的ip为ipv6 Integer srcMaskNum = Integer.parseInt(srcIp.getSrcIpAddress().split("/")[1]); dstIp.setSrcIpMask(IpUtil.convertMask(srcMaskNum)); dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]); - }else if(srcIp.getIpType()==6|| srcIp.getIpType()==64){ + }else if(srcIp.getIpType()==6|| srcIp.getIpType()==64){//64表示源ip为ipv6，目的ip为ipv4 IPv6Network strangeNetwork = IPv6Network.fromString(srcIp.getSrcIpAddress()); dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]); dstIp.setSrcIpMask(strangeNetwork.getNetmask().asAddress().toString()); } }else if(srcIp.getSrcIpAddress().indexOf("-")!=-1){ - if(srcIp.getIpType()==4|| srcIp.getIpType()==46){ + if(srcIp.getIpType()==4|| srcIp.getIpType()==46){//46表示源ip为ipv4，目的ip为ipv6 dstIp.setSrcIp(srcIp.getSrcIpAddress().split("-")[0]); dstIp.setSrcIpMask(IpUtil.getMask(srcIp.getSrcIpAddress().split("-")[0], srcIp.getSrcIpAddress().split("-")[1])); - }else if(srcIp.getIpType()==6|| srcIp.getIpType()==64){ + }else if(srcIp.getIpType()==6|| srcIp.getIpType()==64){//64表示源ip为ipv6，目的ip为ipv4 IPv6Address address1 = IPv6Address.fromString(srcIp.getSrcIpAddress().split("-")[0]); IPv6Address address2 = IPv6Address.fromString(srcIp.getSrcIpAddress().split("-")[1]); IPv6Network network = IPv6Network.fromTwoAddresses(address1,address2); @@ -411,41 +411,41 @@ public abstract class BaseService { } }else{ - if(srcIp.getIpType()==4|| srcIp.getIpType()==46){ + if(srcIp.getIpType()==4|| srcIp.getIpType()==46){//46表示源ip为ipv4，目的ip为ipv6 dstIp.setSrcIp(srcIp.getSrcIpAddress()); dstIp.setSrcIpMask("0.0.0.0"); - }else if(srcIp.getIpType()==6|| srcIp.getIpType()==64){ + }else if(srcIp.getIpType()==6|| srcIp.getIpType()==64){//64表示源ip为ipv6，目的ip为ipv4 dstIp.setSrcIp(srcIp.getSrcIpAddress()); dstIp.setSrcIpMask("::"); } } }else{ - if(srcIp.getIpType()==4|| srcIp.getIpType()==46){ + if(srcIp.getIpType()==4|| srcIp.getIpType()==46){//46表示源ip为ipv4，目的ip为ipv6 dstIp.setSrcIp(srcIp.getSrcIpAddress()); dstIp.setSrcIpMask("0.0.0.0"); - }else if(srcIp.getIpType()==6|| srcIp.getIpType()==64){ + }else if(srcIp.getIpType()==6|| srcIp.getIpType()==64){//64表示源ip为ipv6，目的ip为ipv4 dstIp.setSrcIp(srcIp.getSrcIpAddress()); dstIp.setSrcIpMask("::"); } } if(srcIp.getDestIpAddress()!=null){ if(srcIp.getDestIpAddress().indexOf("/")!=-1){ - if(srcIp.getIpType()==4|| srcIp.getIpType()==46){ + if(srcIp.getIpType()==4|| srcIp.getIpType()==64){//64表示源ip为ipv6，目的ip为ipv4 Integer dstMaskNum = Integer.parseInt(srcIp.getDestIpAddress().split("/")[1]); dstIp.setDstIpMask(IpUtil.convertMask(dstMaskNum)); dstIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]); - }else if(srcIp.getIpType()==6|| srcIp.getIpType()==64){ + }else if(srcIp.getIpType()==6|| srcIp.getIpType()==46){//46表示源ip为ipv4，目的ip为ipv6 IPv6Network strangeNetwork = IPv6Network.fromString(srcIp.getDestIpAddress()); dstIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]); dstIp.setDstIpMask(strangeNetwork.getNetmask().asAddress().toString()); } }else if(srcIp.getDestIpAddress().indexOf("-")!=-1){ - if(srcIp.getIpType()==4|| srcIp.getIpType()==46){ + if(srcIp.getIpType()==4|| srcIp.getIpType()==64){//64表示源ip为ipv6，目的ip为ipv4 dstIp.setDstIp(srcIp.getDestIpAddress().split("-")[0]); dstIp.setDstIpMask(IpUtil.getMask(srcIp.getDestIpAddress().split("-")[0], srcIp.getDestIpAddress().split("-")[1])); - }else if(srcIp.getIpType()==6|| srcIp.getIpType()==64){ + }else if(srcIp.getIpType()==6|| srcIp.getIpType()==46){//46表示源ip为ipv4，目的ip为ipv6 IPv6Address address1 = IPv6Address.fromString(srcIp.getDestIpAddress().split("-")[0]); IPv6Address address2 = IPv6Address.fromString(srcIp.getDestIpAddress().split("-")[1]); IPv6Network network = IPv6Network.fromTwoAddresses(address1,address2); @@ -454,20 +454,20 @@ public abstract class BaseService { } }else{ - if(srcIp.getIpType()==4|| srcIp.getIpType()==46){ + if(srcIp.getIpType()==4|| srcIp.getIpType()==64){//64表示源ip为ipv6，目的ip为ipv4 dstIp.setDstIp(srcIp.getDestIpAddress()); dstIp.setDstIpMask("0.0.0.0"); - }else if(srcIp.getIpType()==6|| srcIp.getIpType()==64){ + }else if(srcIp.getIpType()==6|| srcIp.getIpType()==46){//46表示源ip为ipv4，目的ip为ipv6 dstIp.setDstIp(srcIp.getDestIpAddress()); dstIp.setDstIpMask("::"); } } }else{ - if(srcIp.getIpType()==4|| srcIp.getIpType()==46){ + if(srcIp.getIpType()==4|| srcIp.getIpType()==64){//64表示源ip为ipv6，目的ip为ipv4 dstIp.setDstIp(srcIp.getDestIpAddress()); dstIp.setDstIpMask("0.0.0.0"); - }else if(srcIp.getIpType()==6|| srcIp.getIpType()==64){ + }else if(srcIp.getIpType()==6|| srcIp.getIpType()==46){//46表示源ip为ipv4，目的ip为ipv6 dstIp.setDstIp(srcIp.getDestIpAddress()); dstIp.setDstIpMask("::"); }