Skip to content

spliteAddr: support IPv6 #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
briantobin wants to merge 6 commits into
base: master
Choose a base branch
from
Open

spliteAddr: support IPv6 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
93ba5e9
spliteAddr: support IPv6
Oct 4, 2019
65a0d41
Find/replace imports to reference my fork
Oct 4, 2019
2101daf
Run on non-standard port (6123)
Oct 4, 2019
c639dcc
Run server 10 years in the past
Oct 4, 2019
9df2249
Specify a port as cmdline arg. Default is port 123.
Oct 30, 2019
5ebdb7c
Specify a positive or negative day offset relative to current time
Oct 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Please reference [Go install](https://github.com/astaxie/build-web-application-

##### 2. install Sntp

$ go get github.com/btfak/sntp
$ go get github.com/briantobin/sntp

##### More?
[My Blog](http://www.btfak.com)
Expand Down
14 changes: 11 additions & 3 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,20 @@
package main

import (
"github.com/btfak/sntp/netapp"
"github.com/btfak/sntp/netevent"
"flag"
"github.com/briantobin/sntp/netapp"
"github.com/briantobin/sntp/netevent"
"github.com/briantobin/sntp/sntp"
)

func main() {
var port = flag.Int("p", 123, "NTP port")
var offset_days = flag.Int("o", 0, "Time offset (in days)")
flag.Parse()

sntp.Offset_days = int64(*offset_days)

var handler = netapp.GetHandler()
netevent.Reactor.ListenUdp(123, handler)
netevent.Reactor.ListenUdp(*port, handler)
netevent.Reactor.Run()
}
10 changes: 6 additions & 4 deletions netapp/sntp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
package netapp

import (
"github.com/btfak/sntp/netevent"
"github.com/btfak/sntp/sntp"
"github.com/briantobin/sntp/netevent"
"github.com/briantobin/sntp/sntp"
"net"
"strconv"
"strings"
Expand Down Expand Up @@ -37,8 +37,10 @@ func (p *Handler) DatagramReceived(data []byte, addr net.Addr) {
}

func spliteAddr(addr string) (string, int) {
ip := strings.Split(addr, ":")[0]
port := strings.Split(addr, ":")[1]
delimiterIdx := strings.LastIndex(addr, ":")
ip := addr[0:delimiterIdx]
port := addr[delimiterIdx+1:]

p, _ := strconv.Atoi(port)
return ip, p
}
4 changes: 3 additions & 1 deletion sntp/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ func int2bytes(i int64) []byte {
return b
}

var Offset_days int64 = 0

// generate
/*
Field Name Request Reply
Expand All @@ -94,7 +96,7 @@ func int2bytes(i int64) []byte {
Transmit Timestamp (see text) time of day
*/
func generate(req []byte) []byte {
var second = unix2ntp(time.Now().Unix())
var second = unix2ntp(time.Now().Unix() + (60 * 60 * 24 * Offset_days))
var fraction = unix2ntp(int64(time.Now().Nanosecond()))
var res = make([]byte, 48)
var vn = req[0] & 0x38
Expand Down