Skip to content

Commit 29a4085

Browse files
sobomaxsobomax
committed
Start breaking out rtp_proxy client interface to be more modular
in lieu of changes done to the Python code. No functional changes so far.
1 parent 25d0976 commit 29a4085

File tree

11 files changed

+105
-82
lines changed

11 files changed

+105
-82
lines changed

‎cmd/b2bua_radius/call_controller.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ import (
3535
"time"
3636

3737
"github.com/sippy/go-b2bua/sippy"
38+
"github.com/sippy/go-b2bua/sippy/rtp_proxy/session"
3839
"github.com/sippy/go-b2bua/sippy/headers"
3940
"github.com/sippy/go-b2bua/sippy/net"
4041
"github.com/sippy/go-b2bua/sippy/time"
@@ -59,7 +60,7 @@ type callController struct {
5960
cld string
6061
caller_name string
6162
challenge *sippy_header.SipWWWAuthenticate
62-
rtp_proxy_session *sippy.Rtp_proxy_session
63+
rtp_proxy_session *rtp_proxy_session.Rtp_proxy_session
6364
eTry *sippy.CCEventTry
6465
huntstop_scodes []int
6566
acctA Accounting
@@ -167,7 +168,7 @@ func (self *callController) RecvEvent(event sippy_types.CCEvent, ua sippy_types.
167168
}
168169
if len(self.cmap.rtp_proxy_clients) > 0 {
169170
var err error
170-
self.rtp_proxy_session, err = sippy.NewRtp_proxy_session(self.global_config, self.cmap.rtp_proxy_clients, self.cId.CallId, "", "", self.global_config.B2bua_socket, /*notify_tag*/ fmt.Sprintf("r%%20%d", self.id), self.lock)
171+
self.rtp_proxy_session, err = rtp_proxy_session.NewRtp_proxy_session(self.global_config, self.cmap.rtp_proxy_clients, self.cId.CallId, "", "", self.global_config.B2bua_socket, /*notify_tag*/ fmt.Sprintf("r%%20%d", self.id), self.lock)
171172
if err != nil {
172173
self.uaA.RecvEvent(sippy.NewCCEventFail(500, "Internal Server Error (4)", event.GetRtime(), ""))
173174
self.state = CCStateDead

‎cmd/b2bua_radius/main.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ import (
3535
"github.com/sippy/go-b2bua/sippy/cli"
3636
"github.com/sippy/go-b2bua/sippy/net"
3737
"github.com/sippy/go-b2bua/sippy/types"
38+
"github.com/sippy/go-b2bua/sippy/rtp_proxy"
3839
"github.com/sippy/go-b2bua/sippy/utils"
3940
)
4041

@@ -64,14 +65,14 @@ func main() {
6465
}
6566
rtp_proxy_clients := make([]sippy_types.RtpProxyClient, len(global_config.Rtp_proxy_clients_arr))
6667
for i, address := range global_config.Rtp_proxy_clients_arr {
67-
opts, err := sippy.NewRtpProxyClientOpts(address, nil /*bind_address*/, global_config, global_config.ErrorLogger())
68+
opts, err := rtp_proxy.NewRtpProxyClientOpts(address, nil /*bind_address*/, global_config, global_config.ErrorLogger())
6869
if err != nil {
6970
println("Cannot initialize rtpproxy client: " + err.Error())
7071
return
7172
}
7273
opts.SetHeartbeatInterval(global_config.Hrtb_ival_dur)
7374
opts.SetHeartbeatRetryInterval(global_config.Hrtb_retr_ival_dur)
74-
rtpp := sippy.NewRtpProxyClient(opts)
75+
rtpp := rtp_proxy.NewRtpProxyClient(opts)
7576
err = rtpp.Start()
7677
if err != nil {
7778
println("Cannot initialize rtpproxy client: " + err.Error())

sippy/rtp_proxy_client.go renamed to sippy/rtp_proxy/client.go

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,17 @@
2424
// ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
2525
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
2626
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27-
package sippy
27+
28+
package rtp_proxy
2829

2930
import (
3031
"bufio"
3132
"net"
3233
"strconv"
3334
"strings"
3435

36+
"github.com/sippy/go-b2bua/sippy"
37+
"github.com/sippy/go-b2bua/sippy/rtp_proxy/types"
3538
"github.com/sippy/go-b2bua/sippy/net"
3639
"github.com/sippy/go-b2bua/sippy/types"
3740
)
@@ -43,7 +46,7 @@ func NewRtpProxyClient(opts *rtpProxyClientOpts) sippy_types.RtpProxyClient {
4346
type Rtp_proxy_client_base struct {
4447
heir sippy_types.RtpProxyClient
4548
opts *rtpProxyClientOpts
46-
transport rtp_proxy_transport
49+
transport rtp_proxy_types.RtpProxyTransport
4750
online bool
4851
sbind_supported bool
4952
tnot_supported bool
@@ -59,17 +62,8 @@ type Rtp_proxy_client_base struct {
5962
ptransmitted int64
6063
}
6164

62-
type rtp_proxy_transport interface {
63-
address() net.Addr
64-
get_rtpc_delay() float64
65-
is_local() bool
66-
send_command(string, func(string))
67-
shutdown()
68-
reconnect(net.Addr, *sippy_net.HostPort)
69-
}
70-
7165
func (self *Rtp_proxy_client_base) IsLocal() bool {
72-
return self.transport.is_local()
66+
return self.transport.Is_local()
7367
}
7468

7569
func (self *Rtp_proxy_client_base) IsOnline() bool {
@@ -100,7 +94,7 @@ func (self *Rtp_proxy_client_base) me() sippy_types.RtpProxyClient {
10094
}
10195

10296
func (self *Rtp_proxy_client_base) Address() net.Addr {
103-
return self.transport.address()
97+
return self.transport.Address()
10498
}
10599

106100
func NewRtp_proxy_client_base(heir sippy_types.RtpProxyClient, opts *rtpProxyClientOpts) *Rtp_proxy_client_base {
@@ -130,18 +124,18 @@ func (self *Rtp_proxy_client_base) Start() error {
130124
}
131125

132126
func (self *Rtp_proxy_client_base) SendCommand(cmd string, cb func(string)) {
133-
self.transport.send_command(cmd, cb)
127+
self.transport.Send_command(cmd, cb)
134128
}
135129

136130
func (self *Rtp_proxy_client_base) Reconnect(addr net.Addr, bind_addr *sippy_net.HostPort) {
137-
self.transport.reconnect(addr, bind_addr)
131+
self.transport.Reconnect(addr, bind_addr)
138132
}
139133

140134
func (self *Rtp_proxy_client_base) version_check() {
141135
if self.shut_down {
142136
return
143137
}
144-
self.transport.send_command("V", self.version_check_reply)
138+
self.transport.Send_command("V", self.version_check_reply)
145139
}
146140

147141
func (self *Rtp_proxy_client_base) version_check_reply(version string) {
@@ -153,7 +147,7 @@ func (self *Rtp_proxy_client_base) version_check_reply(version string) {
153147
} else if self.online {
154148
self.me().GoOffline()
155149
} else {
156-
StartTimeoutWithSpread(self.version_check, nil, self.opts.hrtb_retr_ival, 1, self.opts.logger, 0.1)
150+
sippy.StartTimeoutWithSpread(self.version_check, nil, self.opts.hrtb_retr_ival, 1, self.opts.logger, 0.1)
157151
}
158152
}
159153

@@ -162,7 +156,7 @@ func (self *Rtp_proxy_client_base) heartbeat() {
162156
if self.shut_down {
163157
return
164158
}
165-
self.transport.send_command("Ib", self.heartbeat_reply)
159+
self.transport.Send_command("Ib", self.heartbeat_reply)
166160
}
167161

168162
func (self *Rtp_proxy_client_base) heartbeat_reply(stats string) {
@@ -198,7 +192,7 @@ func (self *Rtp_proxy_client_base) heartbeat_reply(stats string) {
198192
}
199193
self.me().UpdateActive(active_sessions, sessions_created, active_streams, preceived, ptransmitted)
200194
}
201-
StartTimeoutWithSpread(self.heartbeat, nil, self.opts.hrtb_ival, 1, self.opts.logger, 0.1)
195+
sippy.StartTimeoutWithSpread(self.heartbeat, nil, self.opts.hrtb_ival, 1, self.opts.logger, 0.1)
202196
}
203197

204198
func (self *Rtp_proxy_client_base) GoOnline() {
@@ -222,7 +216,7 @@ func (self *Rtp_proxy_client_base) GoOffline() {
222216
//print "go_offline", self.address, self.online
223217
if self.online {
224218
self.online = false
225-
StartTimeoutWithSpread(self.version_check, nil, self.opts.hrtb_retr_ival, 1, self.opts.logger, 0.1)
219+
sippy.StartTimeoutWithSpread(self.version_check, nil, self.opts.hrtb_retr_ival, 1, self.opts.logger, 0.1)
226220
}
227221
}
228222

@@ -259,7 +253,7 @@ func (self *Rtp_proxy_client_base) Shutdown() {
259253
return
260254
}
261255
self.shut_down = true
262-
self.transport.shutdown()
256+
self.transport.Shutdown()
263257
}
264258

265259
func (self *Rtp_proxy_client_base) IsShutDown() bool {
@@ -271,7 +265,7 @@ func (self *Rtp_proxy_client_base) GetOpts() sippy_types.RtpProxyClientOpts {
271265
}
272266

273267
func (self *Rtp_proxy_client_base) GetRtpcDelay() float64 {
274-
return self.transport.get_rtpc_delay()
268+
return self.transport.Get_rtpc_delay()
275269
}
276270

277271
type rtppCapsChecker struct {
@@ -297,7 +291,7 @@ func newRtppCapsChecker(rtpc *Rtp_proxy_client_base) *rtppCapsChecker {
297291
attr := it.attr // For some reason the it.attr cannot be passed into the following
298292
// function directly - the resulting value is always that of the
299293
// last 'it.attr' value.
300-
rtpc.transport.send_command("VF " + it.vers, func(res string) { self.caps_query_done(res, attr) })
294+
rtpc.transport.Send_command("VF " + it.vers, func(res string) { self.caps_query_done(res, attr) })
301295
}
302296
return self
303297
}

sippy/rtp_proxy_client_stream.go renamed to sippy/rtp_proxy/client/stream.go

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
// ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
2525
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
2626
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27-
package sippy
27+
28+
package rtp_proxy_client
2829

2930
import (
3031
"fmt"
@@ -38,6 +39,7 @@ import (
3839
"github.com/sippy/go-b2bua/sippy/time"
3940
"github.com/sippy/go-b2bua/sippy/types"
4041
"github.com/sippy/go-b2bua/sippy/utils"
42+
"github.com/sippy/go-b2bua/sippy/rtp_proxy/types"
4143
)
4244

4345
const (
@@ -144,7 +146,7 @@ type Rtp_proxy_client_stream struct {
144146
global_config sippy_conf.Config
145147
}
146148

147-
func newRtp_proxy_client_stream(owner sippy_types.RtpProxyClient, global_config sippy_conf.Config, address net.Addr, bind_address *sippy_net.HostPort) (rtp_proxy_transport, error) {
149+
func NewRtp_proxy_client_stream(owner sippy_types.RtpProxyClient, global_config sippy_conf.Config, address net.Addr, bind_address *sippy_net.HostPort) (rtp_proxy_types.RtpProxyTransport, error) {
148150
var err error
149151
if address == nil {
150152
address, err = net.ResolveUnixAddr("unix", "/var/run/rtpproxy.sock")
@@ -178,23 +180,23 @@ func newRtp_proxy_client_stream(owner sippy_types.RtpProxyClient, global_config
178180
return self, nil
179181
}
180182

181-
func (self *Rtp_proxy_client_stream) is_local() bool {
183+
func (self *Rtp_proxy_client_stream) Is_local() bool {
182184
return self._is_local
183185
}
184186

185-
func (self *Rtp_proxy_client_stream) address() net.Addr {
187+
func (self *Rtp_proxy_client_stream) Address() net.Addr {
186188
return self._address
187189
}
188190

189-
func (self *Rtp_proxy_client_stream) send_command(command string, result_callback func(string)) {
191+
func (self *Rtp_proxy_client_stream) Send_command(command string, result_callback func(string)) {
190192
if command[len(command)-1] != '\n' {
191193
command += "\n"
192194
}
193195
self.wi <- &rtpp_req_stream{ command, result_callback }
194196
}
195197

196-
func (self *Rtp_proxy_client_stream) reconnect(address net.Addr, bind_addr *sippy_net.HostPort) {
197-
self.shutdown()
198+
func (self *Rtp_proxy_client_stream) Reconnect(address net.Addr, bind_addr *sippy_net.HostPort) {
199+
self.Shutdown()
198200
self._address = address
199201
self.workers = make([]*_RTPPLWorker, self.nworkers)
200202
for i := 0; i < self.nworkers; i++ {
@@ -203,7 +205,7 @@ func (self *Rtp_proxy_client_stream) reconnect(address net.Addr, bind_addr *sipp
203205
self.delay_flt = sippy_math.NewRecFilter(0.95, 0.25)
204206
}
205207

206-
func (self *Rtp_proxy_client_stream) shutdown() {
208+
func (self *Rtp_proxy_client_stream) Shutdown() {
207209
self.wi <- nil
208210
for _, rworker := range self.workers {
209211
<-rworker.shutdown_chan
@@ -216,7 +218,7 @@ func (self *Rtp_proxy_client_stream) register_delay(rtpc_delay time.Duration) {
216218
self.delay_flt.Apply(rtpc_delay.Seconds())
217219
}
218220

219-
func (self *Rtp_proxy_client_stream) get_rtpc_delay() float64 {
221+
func (self *Rtp_proxy_client_stream) Get_rtpc_delay() float64 {
220222
return self.delay_flt.GetLastval()
221223
}
222224
/*

0 commit comments

Comments
 (0)