Dockerfile

@@ -0,0 +1,34 @@
+FROM centos:7
+
+LABEL maintainer="brewlin" version="1.0" license="MIT"
+
+RUN yum install -y gcc-c++
+
+ENV PATH /usr/local/go/bin:$PATH
+ENV GOROOT /usr/local/go
+ENV GOPATH /home/go
+
+RUN yum -y install wget \
+    && mkdir /home/go \
+    && wget https://studygolang.com/dl/golang/go1.13.10.linux-amd64.tar.gz \
+    && tar -C /usr/local -zxf go1.13.10.linux-amd64.tar.gz \
+    && yum -y install iproute net-tools
+
+RUN echo export GOROOT=/usr/local/go >> /etc/profile
+RUN echo export GOPATH=/home/go >> /etc/profile
+RUN echo "export PATH=$PATH:/usr/local/go/bin" >> /etc/profile
+RUN rm -f go1.13.10.linux-amd64.tar.gz
+RUN source /etc/profile && go version
+RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
+    && echo 'Asia/Shanghai' >/etc/timezone
+
+ADD . /test/net-protocol
+
+RUN cd /test/net-protocol \
+    && cd tool            \
+    && go build -x up.go  \
+    && ./up
+
+WORKDIR /test/net-protocol
+
+CMD [ "/test/net-protocol/tool/up"]

README.md

@@ -7,82 +7,93 @@
   </p>
 
 
-基于go 实现链路层、网络层、传输层、应用层 网络协议栈 ，使用虚拟网卡实现
-## @docs
+基于go 实现链路层、网络层、传输层、应用层 网络协议栈 ，使用虚拟网卡实现 docs: https://wiki.brewlin.com/wiki/github/net-protocol/index/
+## @demo && test
+相关demo以及协议测试在cmd目录下,`cd ./cmd*`
+
+docker
 ```
-相关md文档在cmd目录下，以及相关协议的demo测试
+> docker run -d --device /dev/net/tun:/dev/net/tun --privileged brewlin/net-protocol
+> docker exec -it containerid /bin/bash
+> go run cmd/transport/udp/server/main.go
+> go run cmd/transport/udp/net_client.go
+
 ```
-`./cmd/*.md`
 ## @application 应用层
-- [x] http [docs](./cmd/http.md)
-- [x] websocket [docs](./cmd/websocket.md)
+- [x] [http](https://wiki.brewlin.com/wiki/github/net-protocol/index/)
+- [x] [websocket](http://wiki.brewlin.com/wiki/github/net-protocol/index/)
+- [x] [dns](http://wiki.brewlin.com/wiki/github/net-protocol/index/)
+
 
 ## @transport 传输层
-- [x] tcp [docs](./cmd/tcp.md)
-- [x] udp [docs](./cmd/udp.md)
-- [x] port 端口机制
+- [x] [tcp](http://wiki.brewlin.com/wiki/github/net-protocol/index/)
+- [x] [udp](http://wiki.brewlin.com/wiki/github/net-protocol/index/)
+- [x] [port](http://wiki.brewlin.com/wiki/github/net-protocol/index/) 端口机制 
 
 ## @network 网络层
-- [x] icmp
-- [x] ipv4
-- [x] ipv6
+- [x] [icmp](http://wiki.brewlin.com/wiki/github/net-protocol/index/)
+- [x] [ipv4](http://wiki.brewlin.com/wiki/github/net-protocol/index/)
+- [x] [ipv6](http://wiki.brewlin.com/wiki/github/net-protocol/index/)
 
 ## @link 链路层
-- [x] arp [docs](./cmd/arp.md)
-- [x] ethernet
+- [x] [arp](http://wiki.brewlin.com/wiki/github/net-protocol/index/)
+- [x] [ethernet](http://wiki.brewlin.com/wiki/github/net-protocol/index/) 
 
 ## @物理层
-- [x] tun tap 虚拟网卡的实现
+- [x] tun [tap](http://wiki.brewlin.com/wiki/github/net-protocol/index/) 虚拟网卡的实现
 
 ## @客户端
 发起客户端请求
-- [x] http client 
-- [x] websocket client 
-- [x] tcp client
-## 协议相关api
+- [x] [http client](http://wiki.brewlin.com/wiki/github/net-protocol/index/)
+- [x] [websocket client](http://wiki.brewlin.com/github/wiki/net-protocol/index/)
+- [x] [tcp client](http://wiki.brewlin.com/wiki/github/net-protocol/index/)
+- [x] [udp client](http://wiki.brewlin.com/wiki/github/net-protocol/index/)
+- [x] [dns client](http://wiki.brewlin.com/wiki/github/net-protocol/index/)
+## 协议相关构体
+具体细节文档:http://wiki.brewlin.com/wiki/github/net-protocol/index/
 ### 1.应用层相关协议
-应用层暂时只实现了`http`、`websocket`等文本协议。都基于tcp、对tcp等进行二次封装
+应用层暂时只实现了`http`、`websocket`、`dns`协议。都基于tcp、udp等进行二次封装
 
-[http api](./http-api.md) :`http-api.md`
+http protocol:
 ```
-	http 协议报文
-	GET /chat HTTP/1.1
-	Host: server.example.com
-	Upgrade: websocket
-	Connection: Upgrade
-	Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==
-	Origin: http://example.com
-	Sec-WebSocket-Protcol: chat, superchat
-	Sec-WebSocket-Version: 13
+http 协议报文
+GET /chat HTTP/1.1
+Host: server.example.com
+Upgrade: websocket
+Connection: Upgrade
+Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==
+Origin: http://example.com
+Sec-WebSocket-Protcol: chat, superchat
+Sec-WebSocket-Version: 13
 ```
-[websocket api](./websocket-api.md) : `websocket-api.md`
+websocket protocol:
 ```
-			websocket 数据帧报文
-
-     0               1               2               3               4
-     0 1 2 3 4 5 6 7 8 1 2 3 4 5 6 7 8 1 2 3 4 5 6 7 8 1 2 3 4 5 6 7 8
-     +-+-+-+-+-------+-+-------------+-------------------------------+
-     |F|R|R|R| opcode|M| Payload len |    Extended payload length    |
-     |I|S|S|S|  (4)  |A|     (7)     |             (16/64)           |
-     |N|V|V|V|       |S|             |   (if payload len==126/127)   |
-     | |1|2|3|       |K|             |                               |
-     +-+-+-+-+-------+-+-------------+ - - - - - - - - - - - - - - - +
-     |     Extended payload length continued, if payload len == 127  |
-     + - - - - - - - - - - - - - - - +-------------------------------+
-     |                               |Masking-key, if MASK set to 1  |
-     +-------------------------------+-------------------------------+
-     | Masking-key (continued)       |          Payload Data         |
-     +-------------------------------- - - - - - - - - - - - - - - - +
-     :                     Payload Data continued ...                :
-     + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
-     |                     Payload Data continued ...                |
-     +---------------------------------------------------------------+
+  websocket 数据帧报文
+
+0               1               2               3               4
+0 1 2 3 4 5 6 7 8 1 2 3 4 5 6 7 8 1 2 3 4 5 6 7 8 1 2 3 4 5 6 7 8
++-+-+-+-+-------+-+-------------+-------------------------------+
+|F|R|R|R| opcode|M| Payload len |    Extended payload length    |
+|I|S|S|S|  (4)  |A|     (7)     |             (16/64)           |
+|N|V|V|V|       |S|             |   (if payload len==126/127)   |
+| |1|2|3|       |K|             |                               |
++-+-+-+-+-------+-+-------------+ - - - - - - - - - - - - - - - +
+|     Extended payload length continued, if payload len == 127  |
++ - - - - - - - - - - - - - - - +-------------------------------+
+|                               |Masking-key, if MASK set to 1  |
++-------------------------------+-------------------------------+
+| Masking-key (continued)       |          Payload Data         |
++-------------------------------- - - - - - - - - - - - - - - - +
+:                     Payload Data continued ...                :
++ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+|                     Payload Data continued ...                |
++---------------------------------------------------------------+
 
 ```
 ### 2.传输层相关协议
-传输层实现了`upd`、`tcp`、灯协议，并实现了主要接口
+传输层实现了`upd`、`tcp`、等协议，实现了主要接口
 
-[tcp api](./tcp-api.md):`tcp-api.md`
+tcp protocol:
 
 ```
 		     tcp 首部协议报文
@@ -107,7 +118,7 @@
 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 ```
 
-[udp-api](./udp-api.md):`./udp-api.md`
+udp-protocol:
 ```
 udp 协议报文
 ```
@@ -117,7 +128,7 @@ udp 协议报文
 
 ### 3.网络层相关协议
 
-[ip](./ipv-api.md):`ipv4-api.md`
+ip protocol:
 ```
               ip头部协议报文
 0               1               2               3               4
@@ -137,4 +148,4 @@ udp 协议报文
 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 |                    Options (*** bits)          |  Padding     |
 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-```
+```

cmd/application/dns/README.md

@@ -0,0 +1,26 @@
+[toc]
+# DNS ClIENT
+```
+> cd net-protocol/tool;
+> go build up.go
+> sudo ./up
+
+> cd net-protocol/cmd/application/dns
+> sudo go run dns_client.go
+```
+![](../../../resource/dns_client.png)
+
+
+# DNS SERVER
+启动 udp server,另起窗口发送dns查询并指定dnsserver
+```
+> cd net-protocol/tool;
+> go build up.go
+> sudo ./up
+
+> cd net-protocol/cmd/application/dns
+> sudo go run dns_server.go
+//另起ssh窗口 发送dns查询并指定自定义的dns server 192.168.1.1:53
+> nslookup www.baidu.com 192.168.1.1
+```
+![](../../../resource/dns_server.png)

cmd/application/dns/dns_client.go

@@ -0,0 +1,29 @@
+package main
+
+import (
+	"fmt"
+	"github.com/brewlin/net-protocol/protocol/application/dns"
+	"github.com/brewlin/net-protocol/protocol/header"
+)
+
+func main() {
+	d := dns.NewEndpoint("www.baidu.com")
+	fmt.Println("DNS lookuphost    : www.baidu.com")
+	defer d.Close()
+
+	ir,err := d.Resolve();
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+	for _,v := range *ir {
+		switch v.Type {
+		case header.A:
+			fmt.Println("A(host name)      :",v.Address)
+		case header.CNAME:
+			fmt.Println("CNAME (alias name):",v.Address)
+		}
+	}
+
+
+}

cmd/application/dns/dns_server.go

@@ -0,0 +1,116 @@
+package main
+
+import (
+	"fmt"
+	"github.com/brewlin/net-protocol/config"
+	"github.com/brewlin/net-protocol/internal/endpoint"
+	"github.com/brewlin/net-protocol/pkg/buffer"
+	_ "github.com/brewlin/net-protocol/pkg/logging"
+	_ "github.com/brewlin/net-protocol/pkg/logging"
+	"github.com/brewlin/net-protocol/pkg/waiter"
+	"github.com/brewlin/net-protocol/protocol/header"
+	"github.com/brewlin/net-protocol/protocol/network/ipv4"
+	"github.com/brewlin/net-protocol/protocol/transport/udp"
+	"github.com/brewlin/net-protocol/protocol/transport/udp/client"
+	"github.com/brewlin/net-protocol/stack"
+	"log"
+	"strconv"
+	"strings"
+
+	tcpip "github.com/brewlin/net-protocol/protocol"
+)
+
+//当前demo作为一个dns代理，接受dns请求并转发后，解析响应做一些操作
+func main() {
+	s := endpoint.NewEndpoint()
+
+	udploop(s)
+
+}
+func udploop(s *stack.Stack) {
+	var wq waiter.Queue
+	//新建一个UDP端
+	ep, err := s.NewEndpoint(udp.ProtocolNumber, ipv4.ProtocolNumber, &wq)
+	if err != nil {
+		log.Fatal(err)
+	}
+	//绑定本地端口  53是dns默认端口
+	if err := ep.Bind(tcpip.FullAddress{1, config.LocalAddres, 53}, nil); err != nil {
+		log.Fatal("@main : bind failed :", err)
+	}
+	defer ep.Close()
+	//创建队列 通知 channel
+	waitEntry, notifych := waiter.NewChannelEntry(nil)
+	wq.EventRegister(&waitEntry, waiter.EventIn)
+	defer wq.EventUnregister(&waitEntry)
+
+	var saddr tcpip.FullAddress
+
+	for {
+		v, _, err := ep.Read(&saddr)
+		if err != nil {
+			if err == tcpip.ErrWouldBlock {
+				<-notifych
+				continue
+			}
+			fmt.Println(err)
+			return
+		}
+		//接收到代理请求
+		h := header.DNS(v)
+		fmt.Println("@main :接收到代理域名:", string(h[header.DOMAIN:header.DOMAIN+h.GetDomainLen()-1]))
+		go handle_proxy(v,ep,saddr)
+	}
+}
+//转发代理请求，并解析响应数据
+func handle_proxy(v buffer.View,ep tcpip.Endpoint,saddr tcpip.FullAddress){
+	cli := client.NewClient("8.8.8.8",53)
+	cli.Connect()
+	cli.Write(v)
+	defer cli.Close()
+
+	rsp,err := cli.Read()
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+	//返回给客户端
+	_, _, err = ep.Write(tcpip.SlicePayload(rsp), tcpip.WriteOptions{To: &saddr})
+	if err != nil {
+		fmt.Println(err)
+	}
+	p := header.DNS(rsp)
+	answer := p.GetAnswer()
+
+	for i := 0; i < len(*answer) ; i++ {
+		switch (*answer)[i].Type {
+		case header.A:
+			fmt.Println("dns 目标IP（A):",parseAName((*answer)[i].RData))
+		case header.CNAME:
+			fmt.Println("dns 目标IP（alias):",parseCName((*answer)[i].RData))
+		}
+	}
+}
+func parseAName(rd []byte) string {
+	res := []string{}
+	for _,v := range rd {
+		res = append(res,strconv.Itoa(int(v)))
+	}
+	return strings.Join(res,".")
+}
+
+func parseCName(rd []byte) (res string) {
+	for{
+		l := int(rd[0])
+		if l >= len(rd){
+			res += ".com"
+			return
+		}
+		rd = rd[1:]
+		res += string(rd[0:l])
+		rd = rd[l:]
+		if len(rd) == 0 {
+			return
+		}
+	}
+}

cmd/transport/tcp/client.go

@@ -4,10 +4,13 @@ import (
 	"io/ioutil"
 	"log"
 	"net"
+	"strconv"
+
+	"github.com/brewlin/net-protocol/config"
 )
 
 func main() {
-	addr := "192.168.1.1:9111"
+	addr := config.LocalAddres.To4().String() + ":" + strconv.Itoa(int(config.LocalPort))
 	tcpaddr, err := net.ResolveTCPAddr("", addr)
 	if err != nil {
 		log.Fatal("net Resolvetcp addr error!", err.Error())