-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Modified README.md Changed topology.ini to FatTree Architecture described in Readme/Tutorial
- Loading branch information
christopher.metter
committed
Sep 4, 2014
1 parent
be88a06
commit 70d2633
Showing
61 changed files
with
8,933 additions
and
8,685 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| /* | ||
| /* | ||
| * Copyright (C) 2014 Christopher Metter | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
|
|
@@ -16,48 +16,49 @@ | |
| */ | ||
| package de.uniwuerzburg.info3.ofcprobe.util; | ||
|
|
||
|
|
||
| import org.openflow.protocol.OFMatch; | ||
|
|
||
| /** | ||
| * MetaOFMatch which overrides OFMatch.equals() | ||
| * | ||
| * @author Christopher Metter([email protected]) | ||
| * | ||
| */ | ||
| public class OFMatsch extends OFMatch{ | ||
| public class OFMatsch extends OFMatch { | ||
|
|
||
| /** | ||
| * | ||
| */ | ||
| private static final long serialVersionUID = 1L; | ||
|
|
||
| /** | ||
| * Constructor | ||
| */ | ||
| public OFMatsch() { | ||
| super(); | ||
| } | ||
|
|
||
| /** | ||
| * | ||
| */ | ||
| private static final long serialVersionUID = 1L; | ||
| /** | ||
| * Constructor from match | ||
| * | ||
| * @param match the Match to scan | ||
| */ | ||
| public OFMatsch(OFMatch match) { | ||
| fromMatch(match); | ||
| } | ||
|
|
||
| /** | ||
| * Constructor | ||
| */ | ||
| public OFMatsch() { | ||
| super(); | ||
| } | ||
|
|
||
| /** | ||
| * Constructor from match | ||
| * @param match the Match to scan | ||
| */ | ||
| public OFMatsch(OFMatch match) { | ||
| fromMatch(match); | ||
| } | ||
|
|
||
| /** | ||
| * Read Settings from match | ||
| * @param match the match | ||
| */ | ||
| public void fromMatch(OFMatch match) { | ||
| this.fromString(match.toString()); | ||
| } | ||
|
|
||
| public boolean equals(Object obj){ | ||
|
|
||
| // System.err.println("IM NOT SERIOUS ANYMORE!"); | ||
| if (this == obj) { | ||
| /** | ||
| * Read Settings from match | ||
| * | ||
| * @param match the match | ||
| */ | ||
| public void fromMatch(OFMatch match) { | ||
| this.fromString(match.toString()); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object obj) { | ||
| if (this == obj) { | ||
| return true; | ||
| } | ||
| if (obj == null) { | ||
|
|
@@ -67,20 +68,12 @@ public boolean equals(Object obj){ | |
| return false; | ||
| } | ||
| OFMatch other = (OFMatch) obj; | ||
| if(!Util.equalsFlow(this, other)) { | ||
| System.err.println(this.toString() + ";" + other.toString() + "; false"); | ||
|
|
||
| if (!Util.equalsFlow(this, other)) { | ||
| System.err.println(this.toString() + ";" + other.toString() + "; false"); | ||
| } | ||
|
|
||
| return Util.equalsFlow(this, other); | ||
|
|
||
| } | ||
|
|
||
| // public int hashCode() { | ||
| // System.err.println("some1 was once serious"); | ||
| // return 42; //gnihih | ||
| // } | ||
|
|
||
|
|
||
|
|
||
| } | ||
| } | ||
Oops, something went wrong.