ljhwan026
/
voicegatewaysim
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

원번호 적용

Browse Source
main
Jaehwan Lee 2 years ago
parent 72e3723564
commit cc037e905d
4 changed files with 45 additions and 39 deletions
Show Stats Download Patch File Download Diff File

3
icspacketparser/icssipparser.go
Unescape Escape View File

@ -82,6 +82,7 @@ type SIP struct {
ResType string
XAICall string
XAICallNumber string
Media string
// direction bool
@ -343,6 +344,8 @@ func (s *SIP) setSipStruct(name string, value string) (icserr *icserror.IcsError
return nil
case "X-AICALL":
s.XAICall = value
case "X-AINUMBER":
s.XAICallNumber = value
case "MEDIA":
s.Media = value
default:

30
icssessionmanager/agentoperator.go
Unescape Escape View File

@ -1,8 +1,9 @@
package icssessionmanager
import (
"io/ioutil"
"fmt"
"io/ioutil"
// "net"
"math/rand"
"runtime/debug"
@ -298,7 +299,7 @@ func (s *IcsSession) RequestInvite(inviteto string) {
// postfix := "192.168.0.83"
var callid string
now := time.Now().UnixNano()
callid = fmt.Sprintf("%d%s2@%s", now, s.AgentName,ip)
callid = fmt.Sprintf("%d%s2@%s", now, s.AgentName, ip)
// s.callID = uuid.New().String()
s.m.Lock()
s.callID = callid
@ -334,6 +335,7 @@ func (s *IcsSession) RequestInvite(inviteto string) {
reqInvite.AddSIPHeader(sipasm.ICSSIP_HEADER_CSEQ, cseq)
reqInvite.AddSIPHeader(sipasm.ICSSIP_HEADER_CONTACT, contact)
reqInvite.AddSIPHeader(sipasm.ICSSIP_HEADER_XAICALL, s.referto)
reqInvite.AddSIPHeader(sipasm.ICSSIP_HEADER_XAINUMBER, s.xaiNumber)
//reqInvite.AddSIPHeader(sipasm.ICSSIP_HEADER_EXPIRES, expires)
reqInvite.AddSIPHeader(sipasm.ICSSIP_HEADER_USER_AGENT, userAgent)
reqInvite.AddSIPHeader(sipasm.ICSSIP_HEADER_ALLOW, allow)
@ -357,7 +359,6 @@ func (s *IcsSession) RequestInvite(inviteto string) {
s.SetAgentStatus(STATUS_AGENT_CALLING)
}
l.Printf(icslog.LOG_LEVEL_INFO, s.ID, "Sent Data(%d) [%s]->[%s]>\n%s",
wlen,
(*s.sipNeter).LocalAddr().String(),
@ -396,7 +397,7 @@ func (s *IcsSession) PassInvite(sip *icspacketparser.SIP) *icserror.IcsError {
via := fmt.Sprintf("SIP/2.0/UDP %s;rport;branch=%s", ip, sipasm.GenerateBranch())
maxforwards := "70"
agentName := s.AgentName
agentSplit := agentName[len(agentName)-2:len(agentName)]
agentSplit := agentName[len(agentName)-2 : len(agentName)]
cust1 := strings.SplitN(sip.From, "@", 2)
cust2 := strings.SplitN(cust1[0], ":", 2)
@ -408,13 +409,14 @@ func (s *IcsSession) PassInvite(sip *icspacketparser.SIP) *icserror.IcsError {
l.Printf(icslog.LOG_LEVEL_INFO, s.ID, "Set URI [%s]", s.uri)
s.referto = sip.XAICall
s.xaiNumber = sip.XAICallNumber
to := fmt.Sprintf("<sip:%s@%s;user=phone>", "AISB", ip)
//to := fmt.Sprintf("<sip:%s@%s>", s.AgentName, ip)
// postfix := fmt.Sprintf("@%s", ip)
var callid string
// callid = uuid.New().String()
now := time.Now().UnixNano()
callid = fmt.Sprintf("%d%s2@%s", now, agentName,ip)
callid = fmt.Sprintf("%d%s2@%s", now, agentName, ip)
// if len(s.callID) != 0 {
// callid = s.callID
// //if len(s.regiCallID) != 0 {
@ -436,7 +438,7 @@ func (s *IcsSession) PassInvite(sip *icspacketparser.SIP) *icserror.IcsError {
formats := strings.Split(format, " ")
reqInvite.SDP = sipasm.NewSDPMessage(ip, mediaPort, formats[:], 0)
sdpLength := fmt.Sprintf("%d", len(reqInvite.SDP.String()))
// fmt.Println("###### X-AICALL ", sip.XAICall)
//fmt.Println("###### X-AINUMBER ", sip.XAICall)
// refer := strings.Split(sip.XAICall, "@")[0]
reqInvite.AddSIPHeader(sipasm.ICSSIP_HEADER_VIA, via)
@ -447,6 +449,7 @@ func (s *IcsSession) PassInvite(sip *icspacketparser.SIP) *icserror.IcsError {
reqInvite.AddSIPHeader(sipasm.ICSSIP_HEADER_CSEQ, cseq)
reqInvite.AddSIPHeader(sipasm.ICSSIP_HEADER_CONTACT, contact)
reqInvite.AddSIPHeader(sipasm.ICSSIP_HEADER_XAICALL, sip.XAICall)
reqInvite.AddSIPHeader(sipasm.ICSSIP_HEADER_XAINUMBER, s.xaiNumber)
//reqInvite.AddSIPHeader(sipasm.ICSSIP_HEADER_EXPIRES, expires)
reqInvite.AddSIPHeader(sipasm.ICSSIP_HEADER_USER_AGENT, userAgent)
reqInvite.AddSIPHeader(sipasm.ICSSIP_HEADER_ALLOW, allow)
@ -895,7 +898,7 @@ func (s *IcsSession) ProcACKInvite(sip *icspacketparser.SIP) *icserror.IcsError
transport := conf.SIPConfig.Transport
format := conf.AgentConfig[s.ID].MediaConfig.Format
if conf.Representative.Value {// 대표번호일때 강제로 콜링으로 변환
if conf.Representative.Value { // 대표번호일때 강제로 콜링으로 변환
s.SetAgentStatus(STATUS_AGENT_CALLING)
}
status := s.GetAgentStatus()
@ -1055,7 +1058,6 @@ func (s *IcsSession) ProcACKInvite(sip *icspacketparser.SIP) *icserror.IcsError
// s.rtpMediaNeter.SetRemoteAddr(&remoteAddr)
// l.Printf(icslog.LOG_LEVEL_INFO, s.ID, "Set media remote address - %s(%s)", remoteAddr, s.rtpMediaNeter.RemoteAddr())
///////////////////////////////////////////
///////////////////////////////////////////
// send call signal
@ -1294,7 +1296,7 @@ func (s *IcsSession) SendRequestInvite() {
// fmt.Printf("Send Call Start Sip(%s) count %d!!!!!!!", s.AgentName, s.simLoopCount)
if s.simLoopCount < conf.SimLoopCount {
l.Printf(icslog.LOG_LEVEL_INFO, s.ID, "Send Call Start Sip(%s) count %d!!!!!!!\r\n", s.AgentName, s.simLoopCount)
time.Sleep(time.Second*1)
time.Sleep(time.Second * 1)
s.RequestInvite(s.CustID)
s.simLoopCount += 1
} else {
@ -1419,7 +1421,6 @@ func (s *IcsSession) SendRTPCB(t *icscbtimer.IcsCBTimer) {
// ts := s.rtpTS
// seq := s.rtpSeq
// voiceFilePath := "/home/leejj9612/sim/voice/9001-RX-1648533187911907029.pcm"
voiceFilePath := "/home/icsvsim/voice/Sample.pcm"
readPcmData, ferr := ioutil.ReadFile(voiceFilePath)
@ -1430,7 +1431,6 @@ func (s *IcsSession) SendRTPCB(t *icscbtimer.IcsCBTimer) {
}
// l.Printf(icslog.LOG_LEVEL_ERROR, s.ID, "############ readPcmData %d", readPcmData)
s.m.Lock()
// pcmDataLen := len(s.tts)
pcmDataLen := len(readPcmData)
@ -1466,7 +1466,7 @@ func (s *IcsSession) SendRTPCB(t *icscbtimer.IcsCBTimer) {
// s.rrData.Clear()
l.Printf(icslog.LOG_LEVEL_DEBUG, s.ID, "######## Stoped sendrtpCB[%d] ")
return
case <- t.GetTick():
case <-t.GetTick():
if pcmDataLen < offset+psize {
break
}
@ -1731,7 +1731,7 @@ func (s *IcsSession) ReadRTP() {
}
// func (s *IcsSession)ExpiredRTP(t *icscbtimer.IcsCBTimer) {
func (s *IcsSession)ExpiredRTP(t time.Ticker) {
func (s *IcsSession) ExpiredRTP(t time.Ticker) {
s.mychannel = make(chan bool)
// fmt.Println("### timer start")
// valCheckTimer := time.NewTicker(time.Second)
@ -1740,9 +1740,9 @@ func (s *IcsSession)ExpiredRTP(t time.Ticker) {
select {
case <-s.mychannel:
return
case tm := <- t.C:
case tm := <-t.C:
if s.expCheck {
fmt.Println("agent : ", s.AgentName , " ", tm)
fmt.Println("agent : ", s.AgentName, " ", tm)
} else if !s.expCheck {
if time.Now().Sub(s.expRead) > time.Second {
// fmt.Printf("### session expired %s\n", s.AgentName)

4
icssessionmanager/icssession.go
Unescape Escape View File

@ -2,10 +2,10 @@ package icssessionmanager
import (
"fmt"
"net"
"strings"
"sync"
"time"
"net"
"gitlab.com/ics_cinnamon/joy4/format"
"gitlab.com/ics_cinnamon/voicegateway/icscbtimer"
@ -137,13 +137,13 @@ type IcsSession struct {
//tmp refer to
referto string
simLoopCount int
xaiNumber string
// ExpTimer *icscbtimer.IcsCBTimer
expRead time.Time
readTimer time.Ticker
expCheck bool
mychannel chan bool
m *sync.Mutex
}

3
sipasm/siptemplt.go
Unescape Escape View File

@ -45,6 +45,7 @@ const (
ICSSIP_HEADER_CSEQ
ICSSIP_HEADER_CONTACT
ICSSIP_HEADER_XAICALL
ICSSIP_HEADER_XAINUMBER
ICSSIP_HEADER_ACCEPT
ICSSIP_HEADER_ACCEPT_ENCODING
ICSSIP_HEADER_ACCEPT_LANGUAGE
@ -182,6 +183,7 @@ func initHeaderString() {
ICSSIP_HEADER_STRING[ICSSIP_HEADER_CALL_INFO] = "Call-Info: %s\r\n"
ICSSIP_HEADER_STRING[ICSSIP_HEADER_CONTACT] = "Contact: %s\r\n"
ICSSIP_HEADER_STRING[ICSSIP_HEADER_XAICALL] = "X-AICALL: %s\r\n"
ICSSIP_HEADER_STRING[ICSSIP_HEADER_XAINUMBER] = "X-AINUMBER: %s\r\n"
ICSSIP_HEADER_STRING[ICSSIP_HEADER_CONTENT_DISPOSITION] = "Content-Disposition: %s\r\n"
ICSSIP_HEADER_STRING[ICSSIP_HEADER_CONTENT_ENCODING] = "Content-Encoding: %s\r\n"
ICSSIP_HEADER_STRING[ICSSIP_HEADER_CONTENT_LANGUAGE] = "Content-Language: %s\r\n"
@ -233,6 +235,7 @@ func initHeaderString() {
ICSSIP_HEADER_STRING2TYPE["CALL-INFO"] = ICSSIP_HEADER_CALL_INFO
ICSSIP_HEADER_STRING2TYPE["CONTACT"] = ICSSIP_HEADER_CONTACT
ICSSIP_HEADER_STRING2TYPE["XAICALL"] = ICSSIP_HEADER_XAICALL
ICSSIP_HEADER_STRING2TYPE["XAINUMBER"] = ICSSIP_HEADER_XAINUMBER
ICSSIP_HEADER_STRING2TYPE["CONTENT-DISPOSITION"] = ICSSIP_HEADER_CONTENT_DISPOSITION
ICSSIP_HEADER_STRING2TYPE["CONTENT-ENCODING"] = ICSSIP_HEADER_CONTENT_ENCODING
ICSSIP_HEADER_STRING2TYPE["CONTENT-LANGUAGE"] = ICSSIP_HEADER_CONTENT_LANGUAGE

Write Preview
Loading…
Cancel
Save