Skip to content

Commit 0f0a338

Browse files
authored
Fixed build and added missing vendor entries. (#60)
* Fixed build and added missing vendor entries. I had to add a different origin for the three roughtime.googlesource.com libraries, as I could not make it work with govendor fetch or go get for the life of me. Added roughtime to the makefile and fixed a missing call in the time server to use our scion util library. * Added missing dependencies for webapp * removed some unused libs. Now govendor list +o is empty. * No unused vendor packages * Bring back to vendor context and sha3
1 parent 8808d7e commit 0f0a338

File tree

5 files changed

+52
-47
lines changed

5 files changed

+52
-47
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,6 @@ sensorapp/sensorfetcher/sensorfetcher
4848
sensorapp/sensorserver/sensorserver
4949
webapp/webapp
5050
tools/pathdb_dump/pathdb_dump
51+
netcat/netcat
52+
roughtime/timeclient/timeclient
53+
roughtime/timeserver/timeserver

Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
.PHONY: all clean
22

33
ROOT_DIR=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
4-
# TODO: missing roughtime/timeserver roughtime/timeclient
5-
SRCDIRS= helloworld sensorapp/sensorserver sensorapp/sensorfetcher camerapp/imageserver camerapp/imagefetcher bwtester/bwtestserver bwtester/bwtestclient webapp bat bat/example_server tools/pathdb_dump netcat
4+
SRCDIRS= helloworld sensorapp/sensorserver sensorapp/sensorfetcher camerapp/imageserver camerapp/imagefetcher bwtester/bwtestserver bwtester/bwtestclient webapp bat bat/example_server tools/pathdb_dump roughtime/timeserver roughtime/timeclient netcat
65
TARGETS = $(foreach D,$(SRCDIRS),$(D)/$(notdir $(D)))
76

87
all: $(TARGETS)

roughtime/README.md

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,17 @@ This implementation also allows users who have a [ThinkerForge](https://www.tink
88

99
## Build
1010

11-
Install roughtime library:
12-
13-
```
14-
cd $GOPATH/src/
15-
git clone https://roughtime.googlesource.com/roughtime roughtime.googlesource.com
16-
```
17-
1811
Build server:
1912

2013
```
2114
cd $GOPATH/src/github.com/netsec-ethz/scion-apps/roughtime/timeserver
22-
go get
2315
go build
2416
```
2517

2618
Build client:
2719

2820
```
2921
cd $GOPATH/src/github.com/netsec-ethz/scion-apps/roughtime/timeclient
30-
go get
3122
go build
3223
```
3324

roughtime/timeserver/main.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ import (
66
"os"
77
"time"
88

9+
"github.com/netsec-ethz/scion-apps/lib/scionutil"
910
"github.com/netsec-ethz/scion-apps/roughtime/utils"
1011
"github.com/scionproto/scion/go/lib/snet"
1112
"golang.org/x/crypto/ed25519"
12-
"gopkg.in/alecthomas/kingpin.v2"
13+
kingpin "gopkg.in/alecthomas/kingpin.v2"
1314
"roughtime.googlesource.com/go/protocol"
1415
)
1516

@@ -61,7 +62,7 @@ func runServers(configurationFile, privateKeyFile string) {
6162
}
6263

6364
func serveRequests(bindAddress, connectionProtocol, timedLocation string, privateKey []byte) {
64-
sAddr, err := utils.InitSCIONConnection(bindAddress)
65+
sAddr, err := scionutil.InitSCIONString(bindAddress)
6566
checkErr("Initializing SCION connection", err)
6667

6768
conn, err := snet.ListenSCION(connectionProtocol, sAddr)

vendor/vendor.json

Lines changed: 45 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -151,13 +151,6 @@
151151
"revision": "a35e09f9f224786863ce609de910bc82fc4d4faf",
152152
"revisionTime": "2018-10-23T10:10:25Z"
153153
},
154-
{
155-
"checksumSHA1": "P3zGmsNjW8m15a+nks4FdVpFKwE=",
156-
"license": "2-BSD",
157-
"path": "github.com/gopherjs/gopherjs/js",
158-
"revision": "6f5a3c4a73badf117936d7d61a046e2fab8e2adb",
159-
"revisionTime": "2016-10-23T18:47:00Z"
160-
},
161154
{
162155
"checksumSHA1": "UquR8kc0nKU285HwLbkievlLQz4=",
163156
"path": "github.com/hashicorp/golang-lru",
@@ -675,30 +668,6 @@
675668
"revisionTime": "2019-02-07T16:31:26Z",
676669
"tree": true
677670
},
678-
{
679-
"checksumSHA1": "Vzb+dEH/LTYbvr8RXHmt6xJHz04=",
680-
"license": "3-BSD",
681-
"path": "github.com/smartystreets/assertions/internal/go-render/render",
682-
"revision": "2063fd1cc7c975db70502811a34b06ad034ccdf2",
683-
"revisionTime": "2016-07-07T19:03:55Z"
684-
},
685-
{
686-
"checksumSHA1": "SLC6TfV4icQA9l8YJQu8acJYbuo=",
687-
"license": "APL 2.0",
688-
"path": "github.com/smartystreets/assertions/internal/oglematchers",
689-
"revision": "2063fd1cc7c975db70502811a34b06ad034ccdf2",
690-
"revisionTime": "2016-07-07T19:03:55Z"
691-
},
692-
{
693-
"checksumSHA1": "ZNcNGA0vNsM39HBFmM6JhHcdsLU=",
694-
"comment": "FIXME(kormat): Use fork until https://github.com/smartystreets/goconvey/pull/451 is merged",
695-
"license": "MIT",
696-
"origin": "github.com/kormat/goconvey",
697-
"path": "github.com/smartystreets/goconvey",
698-
"revision": "a9793712606dd72b256bcbb0fad0858aa0e72d67",
699-
"revisionTime": "2016-10-13T14:27:51Z",
700-
"tree": true
701-
},
702671
{
703672
"checksumSHA1": "g27xFm/EIghjjcT3DuGt976CgNo=",
704673
"path": "github.com/walle/lll",
@@ -760,10 +729,28 @@
760729
"revisionTime": "2018-06-07T13:59:11Z"
761730
},
762731
{
763-
"checksumSHA1": "asZBHvcTKF5gVlI7AYnMlLXRYys=",
732+
"checksumSHA1": "eP6ULb7qY83lyYmM7AfaDIRDeXE=",
764733
"path": "golang.org/x/crypto/sha3",
765-
"revision": "b7391e95e576cacdcdd422573063bc057239113d",
766-
"revisionTime": "2019-03-19T22:29:04Z"
734+
"revision": "3d3f9f413869b949e48070b5bc593aa22cc2b8f2",
735+
"revisionTime": "2018-11-10T06:03:37Z"
736+
},
737+
{
738+
"checksumSHA1": "CQYQ8wELyxPMRYOTDLELVtude/M=",
739+
"path": "golang.org/x/image/font",
740+
"revision": "3fc05d484e9f77dd51816890e05f2602e4ca4d65",
741+
"revisionTime": "2019-03-12T13:36:53Z"
742+
},
743+
{
744+
"checksumSHA1": "iV2FonJPeLV+iF4JHS3TRRXegF4=",
745+
"path": "golang.org/x/image/font/basicfont",
746+
"revision": "3fc05d484e9f77dd51816890e05f2602e4ca4d65",
747+
"revisionTime": "2019-03-12T13:36:53Z"
748+
},
749+
{
750+
"checksumSHA1": "euzvwlMLxyD0hwc+raoVsDLv6j4=",
751+
"path": "golang.org/x/image/math/fixed",
752+
"revision": "3fc05d484e9f77dd51816890e05f2602e4ca4d65",
753+
"revisionTime": "2019-03-12T13:36:53Z"
767754
},
768755
{
769756
"checksumSHA1": "GtamqiJoL7PGHsN454AoffBFMa8=",
@@ -887,6 +874,30 @@
887874
"revision": "a5b47d31c556af34a302ce5d659e6fea44d90de0",
888875
"revisionTime": "2016-09-28T15:37:09Z"
889876
},
877+
{
878+
"checksumSHA1": "d+FszpdwcrSQzdoG3w0E2FxQnFQ=",
879+
"comment": "using this fork in github until we know how to govendor fetch from the real path",
880+
"origin": "github.com/juagargi/roughtime/go/client/monotime",
881+
"path": "roughtime.googlesource.com/go/client/monotime",
882+
"revision": "26225bef2678cedbd88baa8a22b85f267a6e88b5",
883+
"revisionTime": "2018-10-29T22:37:29Z"
884+
},
885+
{
886+
"checksumSHA1": "dtUYa81+BOxmiK4NjluVowO8g0U=",
887+
"comment": "using this fork in github until we know how to govendor fetch from the real path",
888+
"origin": "github.com/juagargi/roughtime/go/config",
889+
"path": "roughtime.googlesource.com/go/config",
890+
"revision": "26225bef2678cedbd88baa8a22b85f267a6e88b5",
891+
"revisionTime": "2018-10-29T22:37:29Z"
892+
},
893+
{
894+
"checksumSHA1": "7TVC3xVndRMynYSO7L/fQG6QIkk=",
895+
"comment": "using this fork in github until we know how to govendor fetch from the real path",
896+
"origin": "github.com/juagargi/roughtime/go/protocol",
897+
"path": "roughtime.googlesource.com/go/protocol",
898+
"revision": "26225bef2678cedbd88baa8a22b85f267a6e88b5",
899+
"revisionTime": "2018-10-29T22:37:29Z"
900+
},
890901
{
891902
"checksumSHA1": "Vu7yTzds3lfhARaEKI/8vmhIvLg=",
892903
"license": "MIT",

0 commit comments

Comments
 (0)