mirror
/
av
mirror of https://bitbucket.org/ausocean/av.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ported SocksSetup and tested

This commit is contained in:
saxon 2018-07-22 23:31:19 +09:30
parent 6cc807f56f
commit aaa7cdbdab
1 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
rtmp/rtmp.go
View File

@ -354,7 +354,7 @@ func (s *session) Write(data []byte) (int, error) {
if s.rtmp == nil { if s.rtmp == nil {
return 0, Err(3) return 0, Err(3)
} }
// TODO: port this
if rtmpIsConnected(s.rtmp) == 0 { if rtmpIsConnected(s.rtmp) == 0 {
return 0, Err(1) return 0, Err(1)
} }
@ -472,8 +472,8 @@ func rtmpSetupUrl(r *C.RTMP, u string) int32 {
r.Link.tcUrl.av_len = C.int(strlen(url)) r.Link.tcUrl.av_len = C.int(strlen(url))
} }
} }
// TODO: port this
C.SocksSetup(r, &r.Link.sockshost) socksSetup(r, &r.Link.sockshost)
if r.Link.port == 0 { if r.Link.port == 0 {
switch { switch {
@ -488,6 +488,32 @@ func rtmpSetupUrl(r *C.RTMP, u string) int32 {
return 1 return 1
} }
func socksSetup(r *C.RTMP, sockshost *C.AVal) {
if sockshost.av_len != 0 {
socksport := strchr((*byte)(unsafe.Pointer(sockshost.av_val)), ':')
hostname := strdup((*byte)(unsafe.Pointer(sockshost.av_val)))
if uintptr(unsafe.Pointer(socksport)) != 0 {
*indxBytePtr(unsafe.Pointer(hostname),
int(uintptr(decBytePtr(unsafe.Pointer(socksport),
int(uintptr(unsafe.Pointer(sockshost.av_val))))))) = '\000'
r.Link.sockshost.av_val = (*C.char)(unsafe.Pointer(hostname))
r.Link.sockshost.av_len = C.int(strlen(hostname))
value, err := strconv.Atoi(string(ptrToSlice(unsafe.Pointer(uintptr(
unsafe.Pointer(socksport))+uintptr(1)), int(strlen((*byte)(unsafe.Pointer(
uintptr(unsafe.Pointer(socksport))+uintptr(1)))))+1)))
if err != nil {
log.Println("socksSetup: bad string conversion!")
}
if uintptr(unsafe.Pointer(socksport)) == 0 {
value = 1080
}
r.Link.socksport = C.ushort(value)
}
}
}
/* /*
func rtmpClose(r *C.RTMP) { func rtmpClose(r *C.RTMP) {
closeInternal(r, 0) closeInternal(r, 0)
@ -679,15 +705,6 @@ func rtmpConnect1(r *C.RTMP, cp *C.RTMPPacket) int {
return 1 return 1
} }
/*
func socksSetup(r *RTMP, sockshost *AVal) {
if sockshost.av_len != 0 {
socksport := strchr((*byte)(unsafe.Pointer(sockshost.av_val)), ':')
hostname := strdup((*byte)(unsafe.Pointer(sockshost.av_val)))
}
}
*/
func rtmpConnectStream(r *C.RTMP, seekTime int32) int { func rtmpConnectStream(r *C.RTMP, seekTime int32) int {
var packet C.RTMPPacket var packet C.RTMPPacket