Skip to content

Removing superfluos assingments & return on #ntop #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
knu merged 1 commit into from
Nov 9, 2020
Merged

Removing superfluos assingments & return on #ntop #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions lib/ipaddr.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,13 +112,12 @@ def self.new_ntoh(addr)
def self.ntop(addr)
case addr.size
when 4
s = addr.unpack('C4').join('.')
addr.unpack('C4').join('.')
when 16
s = IN6FORMAT % addr.unpack('n8')
IN6FORMAT % addr.unpack('n8')
else
raise AddressFamilyError, "unsupported address family"
end
return s
end

# Returns a new ipaddr built by bitwise AND.
Expand Down
17 changes: 17 additions & 0 deletions test/test_ipaddr.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,23 @@ def test_s_new_ntoh
assert_equal("192.168.2.1", IPAddr.new_ntoh(a.hton).to_s)
end

def test_ntop
# IPv4
assert_equal("192.168.1.1", IPAddr.ntop("\xC0\xA8\x01\x01"))
# IPv6
assert_equal("0000:0000:0000:0000:0000:0000:0000:0001",
IPAddr.ntop("\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01"))

# Invalid parameters
assert_raise(IPAddr::AddressFamilyError) {
IPAddr.ntop("192.168.1.1")
}

assert_raise(IPAddr::AddressFamilyError) {
IPAddr.ntop("\xC0\xA8\x01\xFF1")
}
end

def test_ipv4_compat
a = IPAddr.new("::192.168.1.2")
assert_equal("::192.168.1.2", a.to_s)
Expand Down