new correction for new auth

Author: Pascal Benoit

sip-to-webrtc/main.go renamed to sip-to-webrtc/main2.go

@@ -45,6 +45,7 @@ func (softphone *Softphone) CloseToInvite() {
 
 // OnOK adds a handler that responds to any incoming ok events.
 func (softphone *Softphone) OnOK(hdlr func(string)) {
+
 	softphone.addMessageListener(func(message string) {
 		if strings.HasPrefix(message, "SIP/2.0 200 OK") {
 			parsed := SIPMessage{}.FromString(message)

sip-to-webrtc/softphone/inboundcall.go

@@ -24,9 +24,9 @@ func (softphone *Softphone) Invite(extension, offer string) {
 	softphone.request(sipMessage, func(message string) bool {
 		authenticateHeader := SIPMessage{}.FromString(message).headers["Proxy-Authenticate"]
 		ai :=  GetAuthInfo(authenticateHeader)
-		ai.Uri = "sip:" + softphone.sipInfo.Domain
+		ai.AuthType = "Proxy-Authorization"
+		ai.Uri = "sip:"+ extension + "@"+ softphone.sipInfo.Domain
 		ai.Method = "INVITE"
-
 		sipMessage.addAuthorization(*softphone, ai).addCseq(softphone).newViaBranch()
 		softphone.request(sipMessage, func(msg string) bool {
 			return false

sip-to-webrtc/softphone/invite.go

@@ -33,7 +33,7 @@ func (softphone *Softphone) register() {
 			}
 
 			message := string(bytes)
-			// log.Print("↓↓↓\n", message)
+			//log.Print("↓↓↓\n", message)
 
 			for _, ml := range softphone.messageListeners {
 				go ml(message)
@@ -58,6 +58,7 @@ func (softphone *Softphone) register() {
 	softphone.request(sipMessage, func(message string) bool {
 		authenticateHeader := SIPMessage{}.FromString(message).headers["WWW-Authenticate"]
 		ai :=  GetAuthInfo(authenticateHeader)
+		ai.AuthType = "Authorization"
 		ai.Uri = "sip:" + softphone.sipInfo.Domain
 		ai.Method = "REGISTER"
 		sipMessage.addAuthorization(*softphone,ai).addCseq(softphone).newViaBranch()

sip-to-webrtc/softphone/register.go

@@ -16,12 +16,10 @@ type SIPMessage struct {
 }
 
 func (sm *SIPMessage) addAuthorization(softphone Softphone, ai AuthInfo) *SIPMessage {
-	sm.headers["Authorization"] = generateAuthorization(softphone.sipInfo, ai)
-
+	sm.headers[ai.AuthType] = generateAuthorization(softphone.sipInfo, ai)
 	return sm
 }
 
-
 func (sm *SIPMessage) newViaBranch() {
 	if val, ok := sm.headers["Via"]; ok {
 		sm.headers["Via"] = regexp.MustCompile(";branch=z9hG4bK.+?$").ReplaceAllString(val, ";branch="+branch())

sip-to-webrtc/softphone/sipmessage.go

@@ -2,7 +2,6 @@
 package softphone
 
 import (
-	"fmt"
 	"log"
 	"math/rand"
 	"strings"
@@ -56,7 +55,7 @@ func (softphone *Softphone) removeMessageListener(key string) {
 }
 
 func (softphone Softphone) request2(sipMessage SIPMessage, expectedResp string) string {
-	fmt.Println(sipMessage.ToString())
+
 
 	if err := softphone.wsConn.WriteMessage(1, []byte(sipMessage.ToString())); err != nil {
 		log.Panic(err)
@@ -92,7 +91,7 @@ func (softphone *Softphone) request(sipMessage SIPMessage, responseHandler func(
 }
 
 func (softphone *Softphone) response(message string) {
-	log.Print("↑↑↑\n", message)
+//	log.Print("↑↑↑\n", message)
 
 	if err := softphone.wsConn.WriteMessage(1, []byte(message)); err != nil {
 		log.Fatal(err)

sip-to-webrtc/softphone/softphone.go

@@ -21,6 +21,7 @@ type SIPInfoResponse struct {
 }
 
 type AuthInfo struct {
+	AuthType string  `json:"auth_type"`
 	Realm string `json:"realm"`
 	Nonce string `json:"nonce"`
 	Uri string `json:"uri"`
@@ -111,4 +112,4 @@ func RandomString() string { // GENERATE A RANDOM CNONCE
 
 func branch() string {
 	return "z9hG4bK" + uuid.New().String()
-}
+}