writeSIPto 추가

icsnet/icsnet.go

@@ -17,6 +17,7 @@ type IcsNeter interface {
 
 	Write(b []byte) (int, *icserror.IcsError)
 	WriteSIP(b []byte) (int, *icserror.IcsError)
+	WriteSIPTo(b []byte, addr *net.UDPAddr) (int, *icserror.IcsError)
 	WriteRTP(b []byte) (int, *icserror.IcsError)
 
 	Read(size int) ([]byte, int, *icserror.IcsError)

icsnet/icstcp.go

@@ -118,6 +118,10 @@ func (u *IcsTCPNet) WriteSIP(b []byte) (int, *icserror.IcsError) {
 	return 0, nil
 }
 
+func (u *IcsTCPNet) WriteSIPTo(b []byte, addr *net.UDPAddr) (int, *icserror.IcsError) {
+	return 0, nil
+}
+
 func (u *IcsTCPNet) WriteRTP(b []byte) (int, *icserror.IcsError) {
 	return 0, nil
 }

icsnet/icsudp.go

@@ -6,6 +6,7 @@ import (
 	"time"
 
 	"gitlab.com/ics_cinnamon/voicegateway/icserror"
+	"gitlab.com/ics_cinnamon/voicegateway/icslog"
 )
 
 type IcsUDPNet struct {
@@ -164,6 +165,26 @@ func (u *IcsUDPNet) WriteSIP(b []byte) (int, *icserror.IcsError) {
 	return wsize, nil
 }
 
+func (u *IcsUDPNet) WriteSIPTo(b []byte, addr *net.UDPAddr) (int, *icserror.IcsError) {
+	l := icslog.GetIcsLog()
+	if u.conn.ICSUDPConn == nil {
+		return 0, icserror.ICSERRNETNotConnectError
+	}
+	l.Printf(icslog.LOG_LEVEL_DEBUG, -1, "################### addr [%v] ", addr)
+
+	//fmt.Println("Write addr ", raddr)
+	//wsize, err := u.conn.ICSUDPConn.WriteTo(b, raddr)
+	wsize, err := u.conn.ICSUDPConn.WriteToUDP(b, addr)
+	//wsize, err := u.conn.ICSUDPConn.Write(b)
+	if err != nil {
+		icserror.ICSERRNETWriteError.SetError(err)
+		l.Printf(icslog.LOG_LEVEL_ERROR, -1, "Writing RTP error[%v] ", err)
+		//fmt.Println("UDP WRITE ERROR -", err)
+		return -1, icserror.ICSERRNETWriteError
+	}
+	return wsize, nil
+}
+
 func (u *IcsUDPNet) WriteRTP(b []byte) (int, *icserror.IcsError) {
 	if u.conn.ICSUDPConn == nil {
 		return 0, icserror.ICSERRNETNotConnectError

icssessionmanager/agentoperator.go

@@ -928,7 +928,8 @@ func (s *IcsSession) ProcACKInvite(sip *icspacketparser.SIP) *icserror.IcsError
 		reqAck.AddSIPHeader(sipasm.ICSSIP_HEADER_CONTENT_LENGTH, "0")
 		reqAck.AddSIPHeader(sipasm.ICSSIP_HEADER_TERMINATOR)
 
-		wlen, werr := (*s.sipNeter).WriteSIP([]byte(reqAck.String()))
+		// wlen, werr := (*s.sipNeter).WriteSIP([]byte(reqAck.String()))
+		wlen, werr := (*s.sipNeter).WriteSIPTo([]byte(reqAck.String()), s.remoteSIPAddr)
 		if werr != nil {
 			l.Print(icslog.LOG_LEVEL_FATAL, s.ID, werr.GetMessage())
 			s.SetAgentStatus(STATUS_AGENT_READY)
@@ -1208,7 +1209,8 @@ func (s *IcsSession) ProcBye(sip *icspacketparser.SIP) *icserror.IcsError {
 	res200.AddSIPHeader(sipasm.ICSSIP_HEADER_CONTACT, contact)
 	res200.AddSIPHeader(sipasm.ICSSIP_HEADER_TERMINATOR)
 
-	wlen, werr := (*s.sipNeter).WriteSIP([]byte(res200.String()))
+	// wlen, werr := (*s.sipNeter).WriteSIP([]byte(res200.String()))
+	wlen, werr := (*s.sipNeter).WriteSIPTo([]byte(res200.String()), s.remoteSIPAddr)
 	if werr != nil {
 		l.Print(icslog.LOG_LEVEL_FATAL, s.ID, werr.GetMessage())
 		s.SetAgentStatus(STATUS_AGENT_READY)
@@ -2033,7 +2035,8 @@ func (s *IcsSession) RequestBYE(inviteSIP *icspacketparser.SIP) {
 		reqOpt.AddSIPHeader(sipasm.ICSSIP_HEADER_CONTENT_LENGTH, contentLength)
 		reqOpt.AddSIPHeader(sipasm.ICSSIP_HEADER_TERMINATOR)
 
-		wlen, werr := (*s.sipNeter).WriteSIP([]byte(reqOpt.String()))
+		// wlen, werr := (*s.sipNeter).WriteSIP([]byte(reqOpt.String()))
+		wlen, werr := (*s.sipNeter).WriteSIPTo([]byte(reqOpt.String()), s.remoteSIPAddr)
 		if werr != nil {
 			l.Print(icslog.LOG_LEVEL_FATAL, s.ID, werr.GetMessage())
 			return

icssessionmanager/icssession.go

@@ -5,6 +5,7 @@ import (
 	"strings"
 	"sync"
 	"time"
+	"net"
 
 	"gitlab.com/ics_cinnamon/joy4/format"
 	"gitlab.com/ics_cinnamon/voicegateway/icscbtimer"
@@ -55,6 +56,8 @@ type IcsSession struct {
 	//TTS data
 	tts []byte
 	
+	remoteSIPAddr *net.UDPAddr
+
 	//call info
 	StartTimeStamp int64
 	EndTimeStamp   int64

icssessionmanager/icssessionmanager.go

@@ -427,6 +427,8 @@ func (sm *SessionManager) Run() (icserr *icserror.IcsError) {
 						}
 					}
 
+					s.remoteSIPAddr = addr
+	
 					//post the sip event to session
 					h := icsevent.NewEventH()
 					evt, evtErr := h.AllocEvent(sip)