You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by cc...@apache.org on 2017/08/29 21:14:24 UTC
[mynewt-newtmgr] 01/02: Update vendored go-coap.
This is an automated email from the ASF dual-hosted git repository.
ccollins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-newtmgr.git
commit b3bbff5a56d5cbd2e21d3e7fc4ff081dce1fe6a4
Author: Christopher Collins <cc...@apache.org>
AuthorDate: Tue Aug 29 14:09:59 2017 -0700
Update vendored go-coap.
---
Gopkg.lock | 4 ++--
.../go-coap/example/client/goap_client.go | 6 +++---
.../go-coap/example/obsclient/obsclient.go | 6 +++---
.../go-coap/example/obsserver/obsserver.go | 14 +++++++-------
.../go-coap/example/server/coap_server.go | 22 +++++++++++-----------
5 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/Gopkg.lock b/Gopkg.lock
index 707bd9e..aaad4de 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -17,7 +17,7 @@
name = "github.com/fatih/structs"
packages = ["."]
revision = "a720dfa8df582c51dee1b36feabb906bde1588bd"
- version = "v1.0.0"
+ version = "v1.0"
[[projects]]
name = "github.com/inconshreveable/mousetrap"
@@ -95,7 +95,7 @@
branch = "master"
name = "github.com/runtimeco/go-coap"
packages = ["."]
- revision = "649f01f0fe93cfeca52e9c7b96f95eca0ca61a5f"
+ revision = "e869704e8ca4a662cdde0e67e006daadd523b2b3"
[[projects]]
name = "github.com/spf13/cast"
diff --git a/vendor/github.com/runtimeco/go-coap/example/client/goap_client.go b/vendor/github.com/runtimeco/go-coap/example/client/goap_client.go
index ae19b84..3add324 100644
--- a/vendor/github.com/runtimeco/go-coap/example/client/goap_client.go
+++ b/vendor/github.com/runtimeco/go-coap/example/client/goap_client.go
@@ -4,17 +4,17 @@ import (
"log"
"os"
- "github.com/dustin/go-coap"
+ "github.com/runtimeco/go-coap"
)
func main() {
- req := coap.MessageBase{
+ req := coap.NewDgramMessage(coap.MessageParams{
Type: coap.Confirmable,
Code: coap.GET,
MessageID: 12345,
Payload: []byte("hello, world!"),
- }
+ })
path := "/some/path"
if len(os.Args) > 1 {
diff --git a/vendor/github.com/runtimeco/go-coap/example/obsclient/obsclient.go b/vendor/github.com/runtimeco/go-coap/example/obsclient/obsclient.go
index 72afa7e..d5cd7ac 100644
--- a/vendor/github.com/runtimeco/go-coap/example/obsclient/obsclient.go
+++ b/vendor/github.com/runtimeco/go-coap/example/obsclient/obsclient.go
@@ -3,16 +3,16 @@ package main
import (
"log"
- "github.com/dustin/go-coap"
+ "github.com/runtimeco/go-coap"
)
func main() {
- req := coap.MessageBase{
+ req := coap.NewDgramMessage(coap.MessageParams{
Type: coap.NonConfirmable,
Code: coap.GET,
MessageID: 12345,
- }
+ })
req.AddOption(coap.Observe, 1)
req.SetPathString("/some/path")
diff --git a/vendor/github.com/runtimeco/go-coap/example/obsserver/obsserver.go b/vendor/github.com/runtimeco/go-coap/example/obsserver/obsserver.go
index c9fac31..f158491 100644
--- a/vendor/github.com/runtimeco/go-coap/example/obsserver/obsserver.go
+++ b/vendor/github.com/runtimeco/go-coap/example/obsserver/obsserver.go
@@ -6,19 +6,19 @@ import (
"net"
"time"
- "github.com/dustin/go-coap"
+ "github.com/runtimeco/go-coap"
)
-func periodicTransmitter(l *net.UDPConn, a *net.UDPAddr, m *coap.MessageBase) {
+func periodicTransmitter(l *net.UDPConn, a *net.UDPAddr, m coap.Message) {
subded := time.Now()
for {
- msg := coap.MessageBase{
+ msg := coap.NewDgramMessage(coap.MessageParams{
Type: coap.Acknowledgement,
Code: coap.Content,
- MessageID: m.MessageID,
+ MessageID: m.MessageID(),
Payload: []byte(fmt.Sprintf("Been running for %v", time.Since(subded))),
- }
+ })
msg.SetOption(coap.ContentFormat, coap.TextPlain)
msg.SetOption(coap.LocationPath, m.Path())
@@ -36,9 +36,9 @@ func periodicTransmitter(l *net.UDPConn, a *net.UDPAddr, m *coap.MessageBase) {
func main() {
log.Fatal(coap.ListenAndServe("udp", ":5683",
- coap.FuncHandler(func(l *net.UDPConn, a *net.UDPAddr, m *coap.MessageBase) *coap.MessageBase {
+ coap.FuncHandler(func(l *net.UDPConn, a *net.UDPAddr, m coap.Message) coap.Message {
log.Printf("Got message path=%q: %#v from %v", m.Path(), m, a)
- if m.Code == coap.GET && m.Option(coap.Observe) != nil {
+ if m.Code() == coap.GET && m.Option(coap.Observe) != nil {
if value, ok := m.Option(coap.Observe).([]uint8); ok &&
len(value) >= 1 && value[0] == 1 {
go periodicTransmitter(l, a, m)
diff --git a/vendor/github.com/runtimeco/go-coap/example/server/coap_server.go b/vendor/github.com/runtimeco/go-coap/example/server/coap_server.go
index 0c1699b..fda9c1f 100644
--- a/vendor/github.com/runtimeco/go-coap/example/server/coap_server.go
+++ b/vendor/github.com/runtimeco/go-coap/example/server/coap_server.go
@@ -4,19 +4,19 @@ import (
"log"
"net"
- "github.com/dustin/go-coap"
+ "github.com/runtimeco/go-coap"
)
-func handleA(l *net.UDPConn, a *net.UDPAddr, m *coap.MessageBase) *coap.MessageBase {
+func handleA(l *net.UDPConn, a *net.UDPAddr, m coap.Message) coap.Message {
log.Printf("Got message in handleA: path=%q: %#v from %v", m.Path(), m, a)
if m.IsConfirmable() {
- res := &coap.MessageBase{
+ res := coap.NewDgramMessage(coap.MessageParams{
Type: coap.Acknowledgement,
Code: coap.Content,
- MessageID: m.MessageID,
- Token: m.Token,
+ MessageID: m.MessageID(),
+ Token: m.Token(),
Payload: []byte("hello to you!"),
- }
+ })
res.SetOption(coap.ContentFormat, coap.TextPlain)
log.Printf("Transmitting from A %#v", res)
@@ -25,16 +25,16 @@ func handleA(l *net.UDPConn, a *net.UDPAddr, m *coap.MessageBase) *coap.MessageB
return nil
}
-func handleB(l *net.UDPConn, a *net.UDPAddr, m *coap.MessageBase) *coap.MessageBase {
+func handleB(l *net.UDPConn, a *net.UDPAddr, m coap.Message) coap.Message {
log.Printf("Got message in handleB: path=%q: %#v from %v", m.Path(), m, a)
if m.IsConfirmable() {
- res := &coap.MessageBase{
+ res := coap.NewDgramMessage(coap.MessageParams{
Type: coap.Acknowledgement,
Code: coap.Content,
- MessageID: m.MessageID,
- Token: m.Token,
+ MessageID: m.MessageID(),
+ Token: m.Token(),
Payload: []byte("good bye!"),
- }
+ })
res.SetOption(coap.ContentFormat, coap.TextPlain)
log.Printf("Transmitting from B %#v", res)
--
To stop receiving notification emails like this one, please contact
"commits@mynewt.apache.org" <co...@mynewt.apache.org>.