Merge pull request #43 from zubairhamed/refactor_betwixt_server

cleanup code

examples/crud/run_crud.go

@@ -1,25 +1,40 @@
 package main
 
 import (
+	"log"
+
 	"github.com/zubairhamed/betwixt"
 	"github.com/zubairhamed/betwixt/examples/objects"
-	"log"
 )
 
 func main() {
 
+	// Channel for exit
+	ch := make(chan bool)
+
 	// Create Server
 	server := CreateServer()
 	server.OnRegistered(func(c betwixt.RegisteredClient) {
 		log.Println("Registered a client with name", c.GetName())
 
-		// Get all resources
-		// v, err := c.ReadResource(3, 0, 0)
-		// log.Println("Read Resource", v, err)
+		var str string
+
+		// Read
+		for i := 0; i <= 16; i++ {
+			v, err := c.ReadResource(3, 0, uint16(i))
+			if err != nil {
+				panic(err.Error())
+			}
+			str = v.GetStringValue()
+			log.Printf("Resource 3/0/%d : %s", i, str)
+		}
+
+		// TODO: Create
 
-		// Create and validate resource
+		// TODO: Delete
 
-		// Delete and validate resource
+		// Exit Example
+		ch <- true
 	})
 
 	go server.Serve()
@@ -32,7 +47,7 @@ func main() {
 	})
 	go client.Start()
 
-	<-make(chan struct{})
+	<-ch
 }
 
 func CreateServer() *betwixt.LWM2MServer {

registeredclient.go

@@ -2,10 +2,11 @@ package betwixt
 
 import (
 	"fmt"
-	. "github.com/zubairhamed/canopus"
 	"log"
 	"net"
 	"time"
+
+	. "github.com/zubairhamed/canopus"
 )
 
 // Returns a new instance of DefaultRegisteredClient implementing RegisteredClient
@@ -92,12 +93,6 @@ func (c *DefaultRegisteredClient) ReadObject(obj uint16, inst uint16) (Value, er
 
 func (c *DefaultRegisteredClient) ReadResource(obj uint16, inst uint16, rsrc uint16) (Value, error) {
 	rAddr, _ := net.ResolveUDPAddr("udp", c.addr)
-	// lAddr, _ := net.ResolveUDPAddr("udp", ":0")
-
-	// log.Println("Remote Addr", rAddr)
-
-	//
-	// conn, _ := net.DialUDP("udp", lAddr, rAddr)
 
 	uri := fmt.Sprintf("/%d/%d/%d", obj, inst, rsrc)
 	req := NewRequest(MessageConfirmable, Get, GenerateMessageID())
@@ -110,11 +105,8 @@ func (c *DefaultRegisteredClient) ReadResource(obj uint16, inst uint16, rsrc uin
 		req.SetMediaType(MediaTypeTextPlainVndOmaLwm2m)
 	}
 
-	log.Println("Z", req.GetMessage().MessageID)
 	response, err := c.coapServer.SendTo(req, rAddr)
 
-	log.Println("B")
-	// response, err := SendMessage(req.GetMessage(), NewUDPConnection(conn))
 	if err != nil {
 		log.Println(err)
 		return nil, err