Use more standard "ipv4" proto instead of "ip".

Arch linux does not by default define the "ip" protocol. Other platforms may have the same situation. See #4.
jnr · Jan 6, 2017 · 4697814 · 4697814
1 parent d0e6f73
commit 4697814
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 23 deletions.
diff --git a/src/test/java/jnr/netdb/FileProtocolDBTest.java b/src/test/java/jnr/netdb/FileProtocolDBTest.java
@@ -34,17 +34,17 @@ public void tearDown() {
 
  @Test public void canLookupIpProtocolByName() {
  ProtocolsDB db = FileProtocolsDB.getInstance();
- Protocol p = db.getProtocolByName("ip");
- assertNotNull("could not lookup ip protocol", p);
- assertEquals("incorrect proto number", 0, p.getProto());
- assertEquals("incorrect name", "ip", p.getName());
+ Protocol p = db.getProtocolByName("ipv4");
+ assertNotNull("could not lookup ipv4 protocol", p);
+ assertEquals("incorrect proto number", 4, p.getProto());
+ assertEquals("incorrect name", "ipv4", p.getName());
  }
 
  @Test public void canLookupIpProtocolByNumber() {
  ProtocolsDB db = FileProtocolsDB.getInstance();
- Protocol p = db.getProtocolByNumber(0);
- assertNotNull("could not lookup ip protocol", p);
- assertEquals("incorrect proto number", 0, p.getProto());
- assertEquals("incorrect name", "ip", p.getName());
+ Protocol p = db.getProtocolByNumber(4);
+ assertNotNull("could not lookup ipv4 protocol", p);
+ assertEquals("incorrect proto number", 4, p.getProto());
+ assertEquals("incorrect name", "ipv4", p.getName());
  }
 }
diff --git a/src/test/java/jnr/netdb/NativeProtocolsDBTest.java b/src/test/java/jnr/netdb/NativeProtocolsDBTest.java
@@ -34,18 +34,18 @@ public void tearDown() {
 
  @Test public void canLookupIpProtocolByName() {
  ProtocolsDB db = NativeProtocolsDB.getInstance();
- Protocol p = db.getProtocolByName("ip");
- assertNotNull("could not lookup ip protocol", p);
- assertEquals("incorrect proto number", 0, p.getProto());
- assertEquals("incorrect name", "ip", p.getName());
+ Protocol p = db.getProtocolByName("ipv4");
+ assertNotNull("could not lookup ipv4 protocol", p);
+ assertEquals("incorrect proto number", 4, p.getProto());
+ assertEquals("incorrect name", "ipv4", p.getName());
  }
 
  @Test public void canLookupIpProtocolByNumber() {
  ProtocolsDB db = NativeProtocolsDB.getInstance();
- Protocol p = db.getProtocolByNumber(0);
- assertNotNull("could not lookup ip protocol", p);
- assertEquals("incorrect proto number", 0, p.getProto());
- assertEquals("incorrect name", "ip", p.getName());
+ Protocol p = db.getProtocolByNumber(4);
+ assertNotNull("could not lookup ipv4 protocol", p);
+ assertEquals("incorrect proto number", 4, p.getProto());
+ assertEquals("incorrect name", "ipv4", p.getName());
  }
 
  @Test public void canLookupTcpProtocolByName() {

diff --git a/src/test/java/jnr/netdb/ProtocolTest.java b/src/test/java/jnr/netdb/ProtocolTest.java
@@ -33,10 +33,10 @@ public void tearDown() {
  }
 
  @Test public void canLookupIpProtocolByName() {
- Protocol p = Protocol.getProtocolByName("ip");
- assertNotNull("could not lookup ip protocol", p);
- assertEquals("incorrect proto number", 0, p.getProto());
- assertEquals("incorrect name", "ip", p.getName());
+ Protocol p = Protocol.getProtocolByName("ipv4");
+ assertNotNull("could not lookup ipv4 protocol", p);
+ assertEquals("incorrect proto number", 4, p.getProto());
+ assertEquals("incorrect name", "ipv4", p.getName());
  }
 
  @Test public void returnsNullOnUnknownProtocol() {
@@ -45,10 +45,10 @@ public void tearDown() {
  }
 
  @Test public void canLookupIpProtocolByNumber() {
- Protocol p = Protocol.getProtocolByNumber(0);
+ Protocol p = Protocol.getProtocolByNumber(4);
  assertNotNull("could not lookup ip protocol", p);
- assertEquals("incorrect proto number", 0, p.getProto());
- assertEquals("incorrect name", "ip", p.getName());
+ assertEquals("incorrect proto number", 4, p.getProto());
+ assertEquals("incorrect name", "ipv4", p.getName());
  }
 
  @Test public void returnsNullOnInvalidNumber() {