Skip to content

Commit c3e6219

Browse files
authored
Expose Address field in IPAddress (#163)
***NO_CI***
1 parent b5b2615 commit c3e6219

File tree

3 files changed

+21
-22
lines changed

3 files changed

+21
-22
lines changed

nanoFramework.System.Net/IPAddress.cs

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ public class IPAddress
2626
/// </summary>
2727
public static readonly IPAddress Loopback = new IPAddress(0x000000000100007F);
2828

29-
[Diagnostics.DebuggerBrowsable(Diagnostics.DebuggerBrowsableState.Never)]
30-
internal long _address;
29+
internal long Address;
3130

3231
[Diagnostics.DebuggerBrowsable(Diagnostics.DebuggerBrowsableState.Never)]
3332
private AddressFamily _family = AddressFamily.InterNetwork;
@@ -63,7 +62,7 @@ public IPAddress(long newAddress)
6362
throw new ArgumentOutOfRangeException();
6463
}
6564

66-
_address = newAddress;
65+
Address = newAddress;
6766

6867
// default to InterNetwork
6968
_family = AddressFamily.InterNetwork;
@@ -79,7 +78,7 @@ public IPAddress(byte[] address)
7978
{
8079
_family = AddressFamily.InterNetwork;
8180
// need to offset address by 4 (1st are family, 2nd are port
82-
_address = ((address[3 + 4] << 24 | address[2 + 4] << 16 | address[1 + 4] << 8 | address[0 + 4]) & 0x0FFFFFFFF);
81+
Address = ((address[3 + 4] << 24 | address[2 + 4] << 16 | address[1 + 4] << 8 | address[0 + 4]) & 0x0FFFFFFFF);
8382
}
8483
else if (address[0] == (byte)AddressFamily.InterNetworkV6)
8584
{
@@ -108,7 +107,7 @@ public override bool Equals(object obj)
108107

109108
if (obj == null) return false;
110109

111-
return this._address == addr._address;
110+
return this.Address == addr.Address;
112111
}
113112

114113
/// <summary>
@@ -119,10 +118,10 @@ public byte[] GetAddressBytes()
119118
{
120119
return new byte[]
121120
{
122-
(byte)(_address),
123-
(byte)(_address >> 8),
124-
(byte)(_address >> 16),
125-
(byte)(_address >> 24)
121+
(byte)(Address),
122+
(byte)(Address >> 8),
123+
(byte)(Address >> 16),
124+
(byte)(Address >> 24)
126125
};
127126
}
128127

@@ -180,13 +179,13 @@ public static IPAddress Parse(string ipString)
180179
/// </remarks>
181180
public override string ToString()
182181
{
183-
return ((byte)(_address)).ToString() +
182+
return ((byte)(Address)).ToString() +
184183
"." +
185-
((byte)(_address >> 8)).ToString() +
184+
((byte)(Address >> 8)).ToString() +
186185
"." +
187-
((byte)(_address >> 16)).ToString() +
186+
((byte)(Address >> 16)).ToString() +
188187
"." +
189-
((byte)(_address >> 24)).ToString();
188+
((byte)(Address >> 24)).ToString();
190189
}
191190

192191
/// <summary>
@@ -223,7 +222,7 @@ internal IPAddress Snapshot()
223222
switch (_family)
224223
{
225224
case AddressFamily.InterNetwork:
226-
return new IPAddress(_address);
225+
return new IPAddress(Address);
227226

228227
//case AddressFamily.InterNetworkV6:
229228
// return new IPAddress(m_Numbers, (uint)m_ScopeId);

nanoFramework.System.Net/IPEndPoint.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,10 @@ public override SocketAddress Serialize()
105105
buffer[2] = unchecked((byte)(_port >> 8));
106106
buffer[3] = unchecked((byte)(_port));
107107

108-
buffer[4] = unchecked((byte)(_address._address));
109-
buffer[5] = unchecked((byte)(_address._address >> 8));
110-
buffer[6] = unchecked((byte)(_address._address >> 16));
111-
buffer[7] = unchecked((byte)(_address._address >> 24));
108+
buffer[4] = unchecked((byte)(_address.Address));
109+
buffer[5] = unchecked((byte)(_address.Address >> 8));
110+
buffer[6] = unchecked((byte)(_address.Address >> 16));
111+
buffer[7] = unchecked((byte)(_address.Address >> 24));
112112

113113
return socketAddress;
114114
}

nanoFramework.System.Net/SocketAddress.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@ internal SocketAddress(IPAddress ipAddress)
7373
//else
7474
{
7575
// IPv4 Address serialization
76-
m_Buffer[4] = unchecked((byte)(ipAddress._address));
77-
m_Buffer[5] = unchecked((byte)(ipAddress._address >> 8));
78-
m_Buffer[6] = unchecked((byte)(ipAddress._address >> 16));
79-
m_Buffer[7] = unchecked((byte)(ipAddress._address >> 24));
76+
m_Buffer[4] = unchecked((byte)(ipAddress.Address));
77+
m_Buffer[5] = unchecked((byte)(ipAddress.Address >> 8));
78+
m_Buffer[6] = unchecked((byte)(ipAddress.Address >> 16));
79+
m_Buffer[7] = unchecked((byte)(ipAddress.Address >> 24));
8080
}
8181
}
8282

0 commit comments

Comments
 (0)