From 27dec52bf7bbb2b181150988ec428289c12e33b1 Mon Sep 17 00:00:00 2001
From: henrik <henrik@localhost.localdomain>
Date: Wed, 17 Mar 2021 16:01:19 +0100
Subject: [PATCH] CLeanups

---
 client/main.go                |  4 ++--
 packages/mdnsserver/server.go | 11 +++--------
 proxy/handleprintjob.go       |  1 -
 proxy/main.go                 | 12 ------------
 4 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/client/main.go b/client/main.go
index 2415354..9786215 100644
--- a/client/main.go
+++ b/client/main.go
@@ -38,8 +38,8 @@ func main() {
 	rb.UnMarshal(httpResponse.Body)
 	fmt.Print(rb)
 
-	fmt.Print("\n-------------\n")
-	printFile("4-untitled")
+	// fmt.Print("\n-------------\n")
+	// printFile("4-untitled")
 
 }
 
diff --git a/packages/mdnsserver/server.go b/packages/mdnsserver/server.go
index 92e1179..5ece7b7 100644
--- a/packages/mdnsserver/server.go
+++ b/packages/mdnsserver/server.go
@@ -24,11 +24,6 @@ func Run(ctx context.Context) {
 		log.Fatalf("EntryGroupNew() failed: %v", err)
 	}
 
-	//hostname, err := a.GetHostName()
-	if err != nil {
-		log.Fatalf("GetHostName() failed: %v", err)
-	}
-
 	fqdn, err := a.GetHostNameFqdn()
 	if err != nil {
 		log.Fatalf("GetHostNameFqdn() failed: %v", err)
@@ -36,11 +31,11 @@ func Run(ctx context.Context) {
 	var txt [][]byte
 
 	txt = append(txt, []byte("note=burken"))
-	txt = append(txt, []byte("product=coola-skrivaren"))
+	txt = append(txt, []byte("product=ChroBroPrint V1"))
 	txt = append(txt, []byte("Color=T"))
 	txt = append(txt, []byte("rp=ipp/print"))
-	txt = append(txt, []byte("ty=ChroBro 001"))
-	err = eg.AddService(avahi.InterfaceUnspec, avahi.ProtoUnspec, 0, "ChroBro 1000", "_ipp._tcp", "local", fqdn, 1234, txt)
+	txt = append(txt, []byte("ty=ChroBroPrint"))
+	err = eg.AddService(avahi.InterfaceUnspec, avahi.ProtoUnspec, 0, "ChroBroPrint", "_ipp._tcp", "local", fqdn, 1234, txt)
 	if err != nil {
 		log.Fatalf("AddService() failed: %v", err)
 	}
diff --git a/proxy/handleprintjob.go b/proxy/handleprintjob.go
index 4ba2a65..6fc5532 100644
--- a/proxy/handleprintjob.go
+++ b/proxy/handleprintjob.go
@@ -58,7 +58,6 @@ func handlePrintJob(r *ipp.Request, byteStream io.Reader, requestID uint32) *ipp
 		j := l[len(l)-1]
 
 		joburi := r.GetAttribute("printer-uri").(*ipp.URIValue).Value() + "/" + j
-		log.Infof(">>>>>>>>>>>>>>>>>>>>>>joburi: %v", joburi)
 		response.AddJobAttribute(ipp.NewURIValue("job-uri", joburi))
 	}
 	response.AddJobAttribute(rb.GetAttribute("job-id"))
diff --git a/proxy/main.go b/proxy/main.go
index 3e9d288..982d3fd 100644
--- a/proxy/main.go
+++ b/proxy/main.go
@@ -41,17 +41,8 @@ func handle(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, "Unsupported method", http.StatusMethodNotAllowed)
 
 	}
-	//log.Info(r.Header)
-	//body := make([]byte, r.ContentLength)
-	//io.ReadFull(r.Body, body)
-	//log.Infof("Body %x", body)
 
 	request := ipp.NewRequest(0, 0)
-	//rdata := make([]byte, r.ContentLength)
-	//io.ReadFull(r.Body, rdata)
-	//log.Printf("Data %x", rdata)
-	//fmt.Printf("data % #0x", rdata)
-	//buf := bytes.NewBuffer(rdata)
 	request.UnMarshal(r.Body)
 	log.Infof("Upstream Request: \n%v\n", request)
 	var response *ipp.Response
@@ -72,8 +63,5 @@ func handle(w http.ResponseWriter, r *http.Request) {
 
 	log.Infof("Upstream Response:\n%v\n", response)
 	data := response.Marshal()
-
-	//log.Debugf("% x", data)
 	w.Write(data)
-
 }