From f9854cbfe19cd14404ad86010a9f942f63a4c47c Mon Sep 17 00:00:00 2001 From: SmallChi <564952747@qq.com> Date: Sat, 1 Dec 2018 23:36:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4IP=E5=9C=B0=E5=9D=80=E7=9A=84?= =?UTF-8?q?=E8=BE=93=E5=87=BA=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Internal/JT808SourcePackageChannelServiceTest.cs | 12 +++++++++++- .../Internal/JT808SourcePackageChannelService.cs | 4 ++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/JT808.DotNetty.Test/Internal/JT808SourcePackageChannelServiceTest.cs b/src/JT808.DotNetty.Test/Internal/JT808SourcePackageChannelServiceTest.cs index ff710d1..507d170 100644 --- a/src/JT808.DotNetty.Test/Internal/JT808SourcePackageChannelServiceTest.cs +++ b/src/JT808.DotNetty.Test/Internal/JT808SourcePackageChannelServiceTest.cs @@ -117,7 +117,7 @@ namespace JT808.DotNetty.Test.Internal Port = 6522 }).Result; - Thread.Sleep(3000); + Thread.Sleep(1000); var result1 = jT808SourcePackageChannelService.GetAll(); @@ -131,6 +131,16 @@ namespace JT808.DotNetty.Test.Internal var result3 = jT808SourcePackageChannelService.GetAll(); } + [Fact] + public void Test2() + { + //[::ffff:127.0.0.1]:13196 + var str = "[::ffff:127.0.0.1]:13196"; + IPAddress.TryParse(str, out IPAddress ip); + var a = ip.MapToIPv4().ToString(); + + var a1 = str.Replace("[::ffff:", "").Replace("]", ""); + } } } diff --git a/src/JT808.DotNetty/Internal/JT808SourcePackageChannelService.cs b/src/JT808.DotNetty/Internal/JT808SourcePackageChannelService.cs index 7af1966..8dcd860 100644 --- a/src/JT808.DotNetty/Internal/JT808SourcePackageChannelService.cs +++ b/src/JT808.DotNetty/Internal/JT808SourcePackageChannelService.cs @@ -107,8 +107,8 @@ namespace JT808.DotNetty.Internal jT808SourcePackageChannelInfoDto.Active = item.Value.Active; jT808SourcePackageChannelInfoDto.Open = item.Value.Open; jT808SourcePackageChannelInfoDto.Registered = item.Value.Registered; - jT808SourcePackageChannelInfoDto.LocalAddress = item.Value.LocalAddress.ToString(); - jT808SourcePackageChannelInfoDto.RemoteAddress = item.Value.RemoteAddress.ToString(); + jT808SourcePackageChannelInfoDto.LocalAddress = item.Value.LocalAddress.ToString().Replace("[::ffff:", "").Replace("]", ""); + jT808SourcePackageChannelInfoDto.RemoteAddress = item.Value.RemoteAddress.ToString().Replace("[::ffff:", "").Replace("]", ""); jT808ResultDto.Data.Add(jT808SourcePackageChannelInfoDto); } return jT808ResultDto;