Static mode for supernode,dump packet, update readme, add code of con…

…cept

.vscode/launch.json

@@ -12,7 +12,7 @@
             "program": "${workspaceFolder}",
             "buildFlags": "-tags=vpp",
             "env": {"CGO_CFLAGS":"-I/usr/include/memif"},
-            "args":["-config","tttttttttt.yaml","-mode","edge"/*,"-example"*/],
+            "args":["-config","example_config/super_mode/s1.yaml","-mode","super"/*,"-example"*/],
         }
     ]
 }

README.md

@@ -4,21 +4,25 @@
 
 A Full Mesh Layer2 VPN based on wireguard-go  
 
+[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](code_of_conduct.md)
+
 OSPF can find best route based on it's cost.  
 But sometimes the lentancy are different in the packet goes and back.  
 I'am thinking, is it possible to find the best route based on the **single-way latency**?  
 For example, I have two routes A and B at node N1, both of them can reach my node N2. A goes fast, but B backs fast.  
-My VPN can automatically send packet through route A at node N1, and the packet backsfrom route B.
+My VPN can automatically send packet through route A at node N1, and the packet backs from route B.
+
+Here is the solution. This VPN `Etherguard` can collect all the single-way lentancy from all nodes, and calculate the best route using [Floyd–Warshall algorithm](https://en.wikipedia.org/wiki/Floyd–Warshall_algorithm).
 
-Here is the solution. This VPN `Etherguard` can collect all the single-way lentancy from all nodes, and calculate the best route using [Floyd–Warshall algorithm](https://en.wikipedia.org/wiki/Floyd%E2%80%93Warshall_algorithm).
+Wirried about the clock not match so that the measure result are not correct? It doesn't matter, here is the proof (Mandarin):  [https://www.kskb.eu.org/2021/08/rootless-routerpart-3-etherguard.html](https://www.kskb.eu.org/2021/08/rootless-routerpart-3-etherguard.html)
 
 ## Usage
 
 ```bash
 Usage of ./etherguard-go:
   -bind string
         UDP socket bind mode. [linux|std]
-        You may need this if tou want to run Etherguard under WSL. (default "linux")
+        You may need std mode if tou want to run Etherguard under WSL. (default "linux")
   -config string
         Config path.
   -example
@@ -68,7 +72,7 @@ Usage of ./etherguard-go:
         2. `kbdbg`: Keyboard debug mode.  
                     Let me construct Layer 2 header by ascii character only.  
                     So that I can track the packet flow with `loglevel` option.
-        3. `noL2`: Remove all Layer 2 header
+        3. `noL2`: Remove all Layer 2 header, all boardcast
 2. `nodeid`: NodeID. Must be unique in the whole Etherguard network.
 3. `nodename`: Node Name.
 4. `defaultttl`: Default TTL(etherguard layer. not affect ethernet layer)
@@ -85,16 +89,16 @@ Usage of ./etherguard-go:
     2. `dupchecktimeout`: Duplication chack timeout.
     3. `conntimeout`: Connection timeout.
     4. `savenewpeers`: Save peer info to local file.
-    5. `supernode`: See [Super Mode](example_config/super_mode/README_zh.md)
-    6. `p2p` See [P2P Mode](example_config/p2p_mode/README_zh.md)
+    5. `supernode`: See [Super Mode](example_config/super_mode/README.md)
+    6. `p2p` See [P2P Mode](example_config/p2p_mode/README.md)
     7. `ntpconfig`: NTP related settings
         1. `usentp`: USE NTP or not.
         2. `maxserveruse`: How many NTP servers should we use at once.  
            First time we will measure lentancy for all NTP server, next time it will use only fastest server.
         3. `synctimeinterval`: NTP sync interval.
         4. `ntptimeout`: NTP timeout
         5. `servers`: NTP server list
-8. `nexthoptable`: Nexthop table。Only static mode use it. See [Static Mㄍㄟ](example_config/super_mode/README_zh.md)
+8. `nexthoptable`: Nexthop table。Only static mode use it. See [Static Mode](example_config/super_mode/README.md)
 9. `resetconninterval`: Reset the endpoint for peers. You may need this if that peer use DDNS.
 10. `peers`: Peer info.
     1. `nodeid`: Node ID.

README_zh.md

@@ -3,6 +3,8 @@
 
 [English](README.md)
 
+[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](code_of_conduct.md)
+
 一個從wireguard-go改來的Full Mesh Layer2 VPN.  
 
 OSPF能夠根據cost自動選路  

code_of_conduct.md

@@ -0,0 +1,133 @@
+
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, caste, color, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+[INSERT CONTACT METHOD].
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.1, available at
+[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
+
+Community Impact Guidelines were inspired by
+[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
+
+For answers to common questions about this code of conduct, see the FAQ at
+[https://www.contributor-covenant.org/faq][FAQ]. Translations are available
+at [https://www.contributor-covenant.org/translations][translations].
+
+[homepage]: https://www.contributor-covenant.org
+[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
+[Mozilla CoC]: https://github.com/mozilla/diversity
+[FAQ]: https://www.contributor-covenant.org/faq
+[translations]: https://www.contributor-covenant.org/translations

config/config.go

@@ -10,8 +10,8 @@ import (
 type Vertex uint16
 
 const (
-	Boardcast        Vertex = math.MaxUint16 - iota // Normal boardcast, boardcast with route table
-	ControlMessage   Vertex = math.MaxUint16 - iota // p2p mode: boardcast to every know keer and prevent dup/ super mode: send to supernode
+	Broadcast        Vertex = math.MaxUint16 - iota // Normal boardcast, boardcast with route table
+	ControlMessage   Vertex = math.MaxUint16 - iota // p2p mode: boardcast to every know peer and prevent dup. super mode: send to supernode
 	SuperNodeMessage Vertex = math.MaxUint16 - iota
 	Special_NodeID   Vertex = SuperNodeMessage
 )
@@ -39,7 +39,9 @@ type SuperConfig struct {
 	RePushConfigInterval    float64
 	Passwords               Passwords
 	GraphRecalculateSetting GraphRecalculateSetting
+	NextHopTable            NextHopTable
 	EdgeTemplate            string
+	UsePSKForInterEdge      bool
 	Peers                   []SuperPeerInfo
 }
 
@@ -86,7 +88,7 @@ type LoggerInfo struct {
 
 func (v *Vertex) ToString() string {
 	switch *v {
-	case Boardcast:
+	case Broadcast:
 		return "Boardcast"
 	case ControlMessage:
 		return "Control"
@@ -135,6 +137,7 @@ type P2Pinfo struct {
 }
 
 type GraphRecalculateSetting struct {
+	StaticMode                bool
 	JitterTolerance           float64
 	JitterToleranceMultiplier float64
 	NodeReportTimeout         float64

device/receive.go

@@ -16,6 +16,8 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/google/gopacket"
+	"github.com/google/gopacket/layers"
 	"golang.org/x/crypto/chacha20poly1305"
 
 	"github.com/KusakabeSi/EtherGuardVPN/config"
@@ -474,7 +476,7 @@ func (peer *Peer) RoutineSequentialReceiver() {
 			}
 		} else {
 			switch dst_nodeID {
-			case config.Boardcast:
+			case config.Broadcast:
 				should_receive = true
 				should_transfer = true
 			case config.SuperNodeMessage:
@@ -492,7 +494,7 @@ func (peer *Peer) RoutineSequentialReceiver() {
 					}
 				}
 			case device.ID:
-				if packet_type == path.NornalPacket {
+				if packet_type == path.NormalPacket {
 					should_receive = true
 				} else {
 					should_process = true
@@ -511,7 +513,7 @@ func (peer *Peer) RoutineSequentialReceiver() {
 				device.log.Verbosef("TTL is 0 %v", dst_nodeID)
 			} else {
 				EgHeader.SetTTL(l2ttl - 1)
-				if dst_nodeID == config.Boardcast { //Regular transfer algorithm
+				if dst_nodeID == config.Broadcast { //Regular transfer algorithm
 					device.TransitBoardcastPacket(src_nodeID, peer.ID, elem.Type, elem.packet, MessageTransportOffsetContent)
 				} else if dst_nodeID == config.ControlMessage { // Control Message will try send to every know node regardless the connectivity
 					skip_list := make(map[config.Vertex]bool)
@@ -535,7 +537,7 @@ func (peer *Peer) RoutineSequentialReceiver() {
 		}
 
 		if should_process {
-			if packet_type != path.NornalPacket {
+			if packet_type != path.NormalPacket {
 				if device.LogLevel.LogControl {
 					if peer.GetEndpointDstStr() != "" {
 						fmt.Println("Control: Received From:" + peer.GetEndpointDstStr() + " " + device.sprint_received(packet_type, elem.packet[path.EgHeaderLen:]))
@@ -549,14 +551,16 @@ func (peer *Peer) RoutineSequentialReceiver() {
 		}
 
 		if should_receive { // Write message to tap device
-			if packet_type == path.NornalPacket {
-				if device.LogLevel.LogNormal {
-					fmt.Println("Normal: Reveived Normal packet From:" + peer.GetEndpointDstStr() + " SrcID:" + src_nodeID.ToString() + " DstID:" + dst_nodeID.ToString() + " Len:" + strconv.Itoa(len(elem.packet)))
-				}
+			if packet_type == path.NormalPacket {
 				if len(elem.packet) <= path.EgHeaderLen+12 {
 					device.log.Errorf("Invalid normal packet from peer %v", peer.ID.ToString())
 					goto skip
 				}
+				if device.LogLevel.LogNormal {
+					fmt.Println("Normal: Reveived Normal packet From:" + peer.GetEndpointDstStr() + " SrcID:" + src_nodeID.ToString() + " DstID:" + dst_nodeID.ToString() + " Len:" + strconv.Itoa(len(elem.packet)))
+					packet := gopacket.NewPacket(elem.packet[path.EgHeaderLen:], layers.LayerTypeEthernet, gopacket.Default)
+					fmt.Println(packet.Dump())
+				}
 				src_macaddr := tap.GetSrcMacAddr(elem.packet[path.EgHeaderLen:])
 				if !tap.IsNotUnicast(src_macaddr) {
 					actual, loaded := device.l2fib.LoadOrStore(src_macaddr, src_nodeID)