Skip to content

Commit

Permalink
mpsquic is now nesquic
Browse files Browse the repository at this point in the history
  • Loading branch information
matzf committed Dec 9, 2020
1 parent af8ab2c commit 3cc80f6
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 15 deletions.
8 changes: 4 additions & 4 deletions _examples/boingboing/boingboing.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ import (

"github.com/netsec-ethz/scion-apps/pkg/appnet"
"github.com/netsec-ethz/scion-apps/pkg/appnet/appquic"
"github.com/netsec-ethz/scion-apps/pkg/mpsquic"
"github.com/netsec-ethz/scion-apps/pkg/nesquic"
)

const (
Expand Down Expand Up @@ -219,11 +219,11 @@ func (c *client) run(remote *snet.UDPAddr, paths []snet.Path) {
}
var err error
if remote.IA == appnet.DefNetwork().IA {
// XXX(matzf) mpsquic does not properly handle destination in same AS. Too many places assume
// XXX(matzf) nesquic does not properly handle destination in same AS. Too many places assume
// an existing path. Easy fallback, use normal appquic.
c.qsess, err = appquic.DialAddr(remote, "host:0", tlsConf, quicConf)
} else {
c.qsess, err = mpsquic.Dial(remote, "host:0", paths, tlsConf, quicConf)
c.qsess, err = nesquic.Dial(remote, "host:0", paths, tlsConf, quicConf)
}
if err != nil {
LogFatal("Unable to dial", "err", err)
Expand Down Expand Up @@ -336,7 +336,7 @@ type server struct {
// On any error, the server exits.
func (s server) run() {
// Listen on SCION address
qsock, err := mpsquic.ListenPort(
qsock, err := nesquic.ListenPort(
uint16(*port),
&tls.Config{
Certificates: appquic.GetDummyTLSCerts(),
Expand Down
2 changes: 1 addition & 1 deletion pkg/mpsquic/flex_conn.go → pkg/nesquic/flex_conn.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package mpsquic
package nesquic

import (
"net"
Expand Down
6 changes: 3 additions & 3 deletions pkg/mpsquic/log.go → pkg/nesquic/log.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package mpsquic
package nesquic

import (
"fmt"
Expand Down Expand Up @@ -40,7 +40,7 @@ func init() {
initLogging(log.Root())
}

// initLogging initializes logging for the mpsquic library using the passed scionproto (or similar) logger
// initLogging initializes logging for the nesquic library using the passed scionproto (or similar) logger
func initLogging(baseLogger log.Logger) {
logger = &Logger{}
logger.Trace = func(msg string, ctx ...interface{}) { baseLogger.Trace("MSQUIC: "+msg, ctx...) }
Expand All @@ -51,7 +51,7 @@ func initLogging(baseLogger log.Logger) {
logger.Crit = func(msg string, ctx ...interface{}) { baseLogger.Crit("MSQUIC: "+msg, ctx...) }
}

// SetBasicLogging sets mpsquic logging to only write to os.Stdout and os.Stderr
// SetBasicLogging sets nesquic logging to only write to os.Stdout and os.Stderr
func SetBasicLogging() {
if logger != nil {
logger.Trace = func(msg string, ctx ...interface{}) { _, _ = fmt.Fprintf(os.Stdout, "%v\t%v", msg, ctx) }
Expand Down
2 changes: 1 addition & 1 deletion pkg/mpsquic/monitor.go → pkg/nesquic/monitor.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mpsquic
package nesquic

import (
"math/rand"
Expand Down
4 changes: 2 additions & 2 deletions pkg/mpsquic/mpsquic.go → pkg/nesquic/nesquic.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

// Package mpsquic is a prototype implementation for a QUIC/SCION "socket" with
// Package nesquic is a prototype implementation for a QUIC/SCION "socket" with
// automatic, performance aware path choice.
//
// The most important design decision/constraint for this package is to make
Expand Down Expand Up @@ -41,7 +41,7 @@
// The monitor reevaluates the path choice at regular time intervals, or when
// the probing observes drastic changes (currently: revocation or timeout for
// active path).
package mpsquic
package nesquic

import (
"context"
Expand Down
2 changes: 1 addition & 1 deletion pkg/mpsquic/pinger.go → pkg/nesquic/pinger.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package mpsquic
package nesquic

import (
"context"
Expand Down
2 changes: 1 addition & 1 deletion pkg/mpsquic/policy.go → pkg/nesquic/policy.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package mpsquic
package nesquic

import (
"time"
Expand Down
2 changes: 1 addition & 1 deletion pkg/mpsquic/revocations.go → pkg/nesquic/revocations.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mpsquic
package nesquic

import (
"context"
Expand Down
2 changes: 1 addition & 1 deletion pkg/mpsquic/server.go → pkg/nesquic/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package mpsquic
package nesquic

import (
"crypto/tls"
Expand Down

0 comments on commit 3cc80f6

Please sign in to comment.