Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
ArpHandler to send ARP reply on proper vlan
[controller.git]
/
opendaylight
/
arphandler
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
arphandler
/
ARPReply.java
diff --git
a/opendaylight/arphandler/src/main/java/org/opendaylight/controller/arphandler/ARPReply.java
b/opendaylight/arphandler/src/main/java/org/opendaylight/controller/arphandler/ARPReply.java
index a6ee60f65d14b5f47b6f7a6cc2db9331f6847d51..1a446b83db92fe1a690e8ac94f181b6bf75705ac 100644
(file)
--- a/
opendaylight/arphandler/src/main/java/org/opendaylight/controller/arphandler/ARPReply.java
+++ b/
opendaylight/arphandler/src/main/java/org/opendaylight/controller/arphandler/ARPReply.java
@@
-23,14
+23,17
@@
public class ARPReply extends ARPEvent {
private final byte[] tMac;
private final byte[] sMac;
private final InetAddress sIP;
private final byte[] tMac;
private final byte[] sMac;
private final InetAddress sIP;
+ private final short vlan;
@Override
public int hashCode() {
final int prime = 31;
int result = super.hashCode();
@Override
public int hashCode() {
final int prime = 31;
int result = super.hashCode();
+ result = prime * result + ((port == null) ? 0 : port.hashCode());
result = prime * result + ((sIP == null) ? 0 : sIP.hashCode());
result = prime * result + Arrays.hashCode(sMac);
result = prime * result + Arrays.hashCode(tMac);
result = prime * result + ((sIP == null) ? 0 : sIP.hashCode());
result = prime * result + Arrays.hashCode(sMac);
result = prime * result + Arrays.hashCode(tMac);
+ result = prime * result + vlan;
return result;
}
return result;
}
@@
-39,13
+42,20
@@
public class ARPReply extends ARPEvent {
if (this == obj) {
return true;
}
if (this == obj) {
return true;
}
- if (
obj == null
) {
+ if (
!super.equals(obj)
) {
return false;
}
if (!(obj instanceof ARPReply)) {
return false;
}
ARPReply other = (ARPReply) obj;
return false;
}
if (!(obj instanceof ARPReply)) {
return false;
}
ARPReply other = (ARPReply) obj;
+ if (port == null) {
+ if (other.port != null) {
+ return false;
+ }
+ } else if (!port.equals(other.port)) {
+ return false;
+ }
if (sIP == null) {
if (other.sIP != null) {
return false;
if (sIP == null) {
if (other.sIP != null) {
return false;
@@
-59,23
+69,28
@@
public class ARPReply extends ARPEvent {
if (!Arrays.equals(tMac, other.tMac)) {
return false;
}
if (!Arrays.equals(tMac, other.tMac)) {
return false;
}
+ if (vlan != other.vlan) {
+ return false;
+ }
return true;
}
return true;
}
- public ARPReply(NodeConnector port, InetAddress sIP, byte[] sMAC, InetAddress tIP, byte[] tMAC) {
+ public ARPReply(NodeConnector port, InetAddress sIP, byte[] sMAC, InetAddress tIP, byte[] tMAC
, short vlan
) {
super(tIP);
this.tMac = tMAC;
this.sIP = sIP;
this.sMac = sMAC;
this.port = port;
super(tIP);
this.tMac = tMAC;
this.sIP = sIP;
this.sMac = sMAC;
this.port = port;
+ this.vlan = vlan;
}
}
- public ARPReply(InetAddress tIP, byte[] tMAC) {
+ public ARPReply(InetAddress tIP, byte[] tMAC
, short vlan
) {
super(tIP);
this.tMac = tMAC;
this.sIP = null;
this.sMac = null;
this.port = null;
super(tIP);
this.tMac = tMAC;
this.sIP = null;
this.sMac = null;
this.port = null;
+ this.vlan = vlan;
}
public byte[] getTargetMac() {
}
public byte[] getTargetMac() {
@@
-94,6
+109,10
@@
public class ARPReply extends ARPEvent {
return port;
}
return port;
}
+ public short getVlan() {
+ return vlan;
+ }
+
/*
* (non-Javadoc)
*
/*
* (non-Javadoc)
*
@@
-122,6
+141,10
@@
public class ARPReply extends ARPEvent {
builder.append("sIP=")
.append(sIP);
}
builder.append("sIP=")
.append(sIP);
}
+ if (vlan != 0) {
+ builder.append(", vlan=")
+ .append(vlan);
+ }
builder.append("]");
return builder.toString();
}
builder.append("]");
return builder.toString();
}