Skip to content

Commit 95aa0b8

Browse files
matzfmatzf
authored
Upgrade to latest scionproto/scion master (#203)
Upgrade SCION dependency version to scionproto/scion master or, equivalently, to the netsec-ethz/scion scionlab-next branch. Apply some package renaming (lib/sciond -> lib/daemon).
1 parent 6de2619 commit 95aa0b8

File tree

9 files changed

+153
-67
lines changed

9 files changed

+153
-67
lines changed

‎.circleci/config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
python3 --version
6363
6464
cd ~/scion
65-
for service in "posix-router" "cs" "dispatcher" "scion-pki" "sciond"; do
65+
for service in "posix-router" "cs" "dispatcher" "scion-pki" "daemon"; do
6666
go build -o ./bin/ ./go/${service}/ && echo "Built ${service}";
6767
done
6868

‎_examples/hellodrkey/hellodrkey.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import (
2121
"time"
2222

2323
"github.com/scionproto/scion/go/lib/addr"
24+
"github.com/scionproto/scion/go/lib/daemon"
2425
"github.com/scionproto/scion/go/lib/drkey"
2526
"github.com/scionproto/scion/go/lib/drkey/protocol"
26-
"github.com/scionproto/scion/go/lib/sciond"
2727
)
2828

2929
const (
@@ -46,14 +46,14 @@ func check(e error) {
4646
}
4747

4848
type Client struct {
49-
sciond sciond.Connector
49+
daemon daemon.Connector
5050
}
5151

5252
func NewClient(sciondPath string) Client {
53-
sciond, err := sciond.NewService(sciondPath).Connect(context.Background())
53+
daemon, err := daemon.NewService(sciondPath).Connect(context.Background())
5454
check(err)
5555
return Client{
56-
sciond: sciond,
56+
daemon: daemon,
5757
}
5858
}
5959

@@ -62,7 +62,7 @@ func (c Client) HostKey(meta drkey.Lvl2Meta) drkey.Lvl2Key {
6262
defer cancelF()
6363

6464
// get L2 key: (slow path)
65-
key, err := c.sciond.DRKeyGetLvl2Key(ctx, meta, timestamp)
65+
key, err := c.daemon.DRKeyGetLvl2Key(ctx, meta, timestamp)
6666
check(err)
6767
return key
6868
}
@@ -81,14 +81,14 @@ func ThisClientAndMeta() (Client, drkey.Lvl2Meta) {
8181
}
8282

8383
type Server struct {
84-
sciond sciond.Connector
84+
daemon daemon.Connector
8585
}
8686

8787
func NewServer(sciondPath string) Server {
88-
sciond, err := sciond.NewService(sciondPath).Connect(context.Background())
88+
daemon, err := daemon.NewService(sciondPath).Connect(context.Background())
8989
check(err)
9090
return Server{
91-
sciond: sciond,
91+
daemon: daemon,
9292
}
9393
}
9494

@@ -102,7 +102,7 @@ func (s Server) dsForServer(meta drkey.Lvl2Meta) drkey.DelegationSecret {
102102
SrcIA: meta.SrcIA,
103103
DstIA: meta.DstIA,
104104
}
105-
lvl2Key, err := s.sciond.DRKeyGetLvl2Key(ctx, dsMeta, timestamp)
105+
lvl2Key, err := s.daemon.DRKeyGetLvl2Key(ctx, dsMeta, timestamp)
106106
check(err)
107107
fmt.Printf("Only the server obtains it: DS key = %s\n", hex.EncodeToString(lvl2Key.Key))
108108
ds := drkey.DelegationSecret{

‎go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ require (
1111
github.com/lucas-clemente/quic-go v0.21.1
1212
github.com/mattn/go-sqlite3 v1.14.4
1313
github.com/msteinert/pam v0.0.0-20190215180659-f29b9f28d6f9
14-
github.com/netsec-ethz/rains v0.2.0
14+
github.com/netsec-ethz/rains v0.3.0
1515
github.com/pelletier/go-toml v1.9.3
16-
github.com/scionproto/scion v0.6.0
16+
github.com/scionproto/scion v0.6.1-0.20210929154253-764d6e2afe47
1717
github.com/smartystreets/goconvey v1.6.4
18-
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
18+
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2
1919
golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8
2020
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1
2121
gopkg.in/alecthomas/kingpin.v2 v2.2.6
2222
)
2323

24-
replace github.com/scionproto/scion => github.com/netsec-ethz/scion v0.0.0-20210825190202-fc081bebc932
24+
replace github.com/scionproto/scion => github.com/netsec-ethz/scion v0.0.0-20211005155700-e5719e3cd5ed

‎go.sum‎

Lines changed: 108 additions & 23 deletions
Large diffs are not rendered by default.

‎pkg/appnet/appnet.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ import (
5858
"time"
5959

6060
"github.com/scionproto/scion/go/lib/addr"
61-
"github.com/scionproto/scion/go/lib/sciond"
61+
"github.com/scionproto/scion/go/lib/daemon"
6262
"github.com/scionproto/scion/go/lib/snet"
6363
"github.com/scionproto/scion/go/lib/snet/addrutil"
6464
"github.com/scionproto/scion/go/lib/sock/reliable"
@@ -193,38 +193,38 @@ func initDefNetwork() error {
193193
if err != nil {
194194
return err
195195
}
196-
sciondConn, err := findSciond(ctx)
196+
daemonConn, err := findSciond(ctx)
197197
if err != nil {
198198
return err
199199
}
200-
localIA, err := sciondConn.LocalIA(ctx)
200+
localIA, err := daemonConn.LocalIA(ctx)
201201
if err != nil {
202202
return err
203203
}
204-
hostInLocalAS, err := findAnyHostInLocalAS(ctx, sciondConn)
204+
hostInLocalAS, err := findAnyHostInLocalAS(ctx, daemonConn)
205205
if err != nil {
206206
return err
207207
}
208-
pathQuerier := sciond.Querier{Connector: sciondConn, IA: localIA}
208+
pathQuerier := daemon.Querier{Connector: daemonConn, IA: localIA}
209209
n := snet.NewNetwork(
210210
localIA,
211211
dispatcher,
212-
sciond.RevHandler{Connector: sciondConn},
212+
daemon.RevHandler{Connector: daemonConn},
213213
)
214214
defNetwork = Network{Network: n, IA: localIA, PathQuerier: pathQuerier, hostInLocalAS: hostInLocalAS}
215215
return nil
216216
}
217217

218-
func findSciond(ctx context.Context) (sciond.Connector, error) {
218+
func findSciond(ctx context.Context) (daemon.Connector, error) {
219219
address, ok := os.LookupEnv("SCION_DAEMON_ADDRESS")
220220
if !ok {
221-
address = sciond.DefaultAPIAddress
221+
address = daemon.DefaultAPIAddress
222222
}
223-
sciondConn, err := sciond.NewService(address).Connect(ctx)
223+
daemonConn, err := daemon.NewService(address).Connect(ctx)
224224
if err != nil {
225225
return nil, fmt.Errorf("unable to connect to SCIOND at %s (override with SCION_DAEMON_ADDRESS): %w", address, err)
226226
}
227-
return sciondConn, nil
227+
return daemonConn, nil
228228
}
229229

230230
func findDispatcher() (reliable.Dispatcher, error) {
@@ -264,8 +264,8 @@ func isSocket(mode os.FileMode) bool {
264264
}
265265

266266
// findAnyHostInLocalAS returns the IP address of some (infrastructure) host in the local AS.
267-
func findAnyHostInLocalAS(ctx context.Context, sciondConn sciond.Connector) (net.IP, error) {
268-
addr, err := sciond.TopoQuerier{Connector: sciondConn}.UnderlayAnycast(ctx, addr.SvcCS)
267+
func findAnyHostInLocalAS(ctx context.Context, sciondConn daemon.Connector) (net.IP, error) {
268+
addr, err := daemon.TopoQuerier{Connector: sciondConn}.UnderlayAnycast(ctx, addr.SvcCS)
269269
if err != nil {
270270
return nil, err
271271
}

‎pkg/integration/integration.go‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ package integration
1717
import (
1818
"context"
1919
"fmt"
20-
"github.com/scionproto/scion/go/lib/snet"
2120
"io"
2221
"net"
2322
"os"
@@ -26,9 +25,11 @@ import (
2625
"strings"
2726
"time"
2827

28+
"github.com/scionproto/scion/go/lib/snet"
29+
2930
"github.com/scionproto/scion/go/lib/addr"
31+
"github.com/scionproto/scion/go/lib/daemon"
3032
"github.com/scionproto/scion/go/lib/log"
31-
"github.com/scionproto/scion/go/lib/sciond"
3233
"github.com/scionproto/scion/go/lib/snet/addrutil"
3334

3435
"github.com/netsec-ethz/scion-apps/pkg/integration/sintegration"
@@ -179,12 +180,12 @@ func replacePattern(pattern string, replacement string, args []string) []string
179180

180181
// HostAddr gets _a_ host address, the same way appnet does, for a given IA
181182
var HostAddr sintegration.HostAddr = func(ia addr.IA) *snet.UDPAddr {
182-
sciond, err := getSCIONDAddress(ia)
183+
daemon, err := getSCIONDAddress(ia)
183184
if err != nil {
184185
log.Error("Failed to get sciond address", "err", err)
185186
return nil
186187
}
187-
hostIP, err := DefaultLocalIPAddress(sciond)
188+
hostIP, err := DefaultLocalIPAddress(daemon)
188189
if err != nil {
189190
log.Error("Failed to get valid host IP", "err", err)
190191
return nil
@@ -216,17 +217,17 @@ func DefaultLocalIPAddress(sciondAddress string) (net.IP, error) {
216217
return addrutil.ResolveLocal(hostInLocalAS)
217218
}
218219

219-
func connSciond(ctx context.Context, sciondAddress string) (sciond.Connector, error) {
220-
sciondConn, err := sciond.NewService(sciondAddress).Connect(ctx)
220+
func connSciond(ctx context.Context, sciondAddress string) (daemon.Connector, error) {
221+
sciondConn, err := daemon.NewService(sciondAddress).Connect(ctx)
221222
if err != nil {
222223
return nil, fmt.Errorf("unable to connect to SCIOND at %s (override with SCION_DAEMON_ADDRESS): %w", sciondAddress, err)
223224
}
224225
return sciondConn, nil
225226
}
226227

227228
// findAnyHostInLocalAS returns the IP address of some (infrastructure) host in the local AS.
228-
func findAnyHostInLocalAS(ctx context.Context, sciondConn sciond.Connector) (net.IP, error) {
229-
bsAddr, err := sciond.TopoQuerier{Connector: sciondConn}.UnderlayAnycast(ctx, addr.SvcCS)
229+
func findAnyHostInLocalAS(ctx context.Context, sciondConn daemon.Connector) (net.IP, error) {
230+
bsAddr, err := daemon.TopoQuerier{Connector: sciondConn}.UnderlayAnycast(ctx, addr.SvcCS)
230231
if err != nil {
231232
return nil, err
232233
}

‎pkg/integration/sintegration/sintegration.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ import (
3333

3434
"github.com/scionproto/scion/go/lib/addr"
3535
"github.com/scionproto/scion/go/lib/common"
36+
"github.com/scionproto/scion/go/lib/daemon"
3637
"github.com/scionproto/scion/go/lib/log"
37-
"github.com/scionproto/scion/go/lib/sciond"
3838
"github.com/scionproto/scion/go/lib/snet"
3939
"github.com/scionproto/scion/go/lib/util"
4040
)
@@ -268,5 +268,5 @@ func GetSCIONDAddress(networksFile string, ia addr.IA) (string, error) {
268268
if err != nil {
269269
return "", err
270270
}
271-
return fmt.Sprintf("[%v]:%d", addresses[ia.String()], sciond.DefaultAPIPort), nil
271+
return fmt.Sprintf("[%v]:%d", addresses[ia.String()], daemon.DefaultAPIPort), nil
272272
}

‎webapp/lib/config.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
log "github.com/inconshreveable/log15"
3232
. "github.com/netsec-ethz/scion-apps/webapp/util"
3333
"github.com/pelletier/go-toml"
34-
"github.com/scionproto/scion/go/lib/sciond"
34+
"github.com/scionproto/scion/go/lib/daemon"
3535
)
3636

3737
// default params for localhost testing
@@ -198,7 +198,7 @@ func getSDFromSDTomlFile(path string) string {
198198
if sd, ok := os.LookupEnv("SCION_DAEMON_ADDRESS"); ok {
199199
return sd
200200
}
201-
return sciond.DefaultAPIAddress
201+
return daemon.DefaultAPIAddress
202202
}
203203

204204
// getIAFromTopologyFile returns IA from topology.json on the given path

‎webapp/lib/sciond.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import (
3737
. "github.com/netsec-ethz/scion-apps/webapp/util"
3838
"github.com/scionproto/scion/go/lib/addr"
3939
"github.com/scionproto/scion/go/lib/common"
40-
"github.com/scionproto/scion/go/lib/sciond"
40+
"github.com/scionproto/scion/go/lib/daemon"
4141
"github.com/scionproto/scion/go/lib/snet"
4242
)
4343

@@ -70,11 +70,11 @@ func returnPathHandler(w http.ResponseWriter, pathJSON []byte, segJSON []byte, e
7070

7171
// connect opens a connection to the scion daemon at sciondAddress or, if
7272
// empty, the default address.
73-
func connect(sciondAddress string) (sciond.Connector, error) {
73+
func connect(sciondAddress string) (daemon.Connector, error) {
7474
if len(sciondAddress) == 0 {
75-
sciondAddress = sciond.DefaultAPIAddress
75+
sciondAddress = daemon.DefaultAPIAddress
7676
}
77-
sciondConn, err := sciond.NewService(sciondAddress).Connect(context.Background())
77+
sciondConn, err := daemon.NewService(sciondAddress).Connect(context.Background())
7878
if CheckError(err) {
7979
return nil, err
8080
}
@@ -236,9 +236,9 @@ func removeAllDir(dirName string) {
236236
CheckError(err)
237237
}
238238

239-
func getPathsJSON(sciondConn sciond.Connector, dstIA addr.IA) ([]byte, error) {
239+
func getPathsJSON(sciondConn daemon.Connector, dstIA addr.IA) ([]byte, error) {
240240
ctx := context.Background()
241-
paths, err := sciondConn.Paths(ctx, dstIA, addr.IA{}, sciond.PathReqFlags{})
241+
paths, err := sciondConn.Paths(ctx, dstIA, addr.IA{}, daemon.PathReqFlags{})
242242
if err != nil {
243243
return nil, err
244244
}

0 commit comments

Comments
 (0)