Skip to content

Commit 6149cec

Browse files
committed
move certs data to testData
1 parent b7bb41d commit 6149cec

File tree

9 files changed

+11
-9
lines changed

9 files changed

+11
-9
lines changed

ript_client/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ func (c *riptClient) recordContent() {
140140
return
141141
case content := <-contentChan:
142142
nanos := time.Now().UnixNano()
143+
log.Printf("")
143144
millis := nanos / 1000000
144145
m := api.StreamContentMedia{
145146
Type: api.StreamContentTypeMedia,
@@ -174,7 +175,6 @@ func (c *riptClient) playOutContent() {
174175
c.client.SetReceiveChan(c.recvChan)
175176
speaker, err := NewSpeaker()
176177
chk(err)
177-
178178
for {
179179
select {
180180
case <-c.stopChan:

ript_client/quic_client.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313

1414
"github.com/bifurcation/mint/syntax"
1515

16-
"github.com/WhatIETF/goRIPT/common"
16+
"github.com/WhatIETF/goRIPT/testData"
1717

1818
"github.com/WhatIETF/goRIPT/api"
1919
"github.com/labstack/gommon/log"
@@ -41,7 +41,7 @@ func NewQuicClientFace(serverInfo *riptProviderInfo, dev bool) *QuicClientFace {
4141
}
4242
// add ca-cert when run in dev mode alone
4343
if dev {
44-
common.AddRootCA(pool)
44+
testData.AddRootCA(pool)
4545
}
4646

4747
quicConf := &quic.Config{
@@ -130,8 +130,8 @@ func (c *QuicClientFace) Send(pkt api.Packet) error {
130130
if err != nil || res.StatusCode != 200 {
131131
break
132132
}
133-
log.Printf("ript_client:send: posted media fragment Id [%d], len [%d]", pkt.StreamMedia.SeqNo,
134-
len(pkt.StreamMedia.Media))
133+
//log.Printf("ript_client:send: posted media fragment Id [%d], len [%d]", pkt.StreamMedia.SeqNo,
134+
// len(pkt.StreamMedia.Media))
135135

136136
case api.StreamMediaRequestPacket:
137137
url := c.serverInfo.baseUrl + c.serverInfo.getTrunkGroupUri() + "/calls/123/media"

ript_net/service.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,10 +216,8 @@ func Match(s, o api.Advertisement) ([]api.DirectiveInfo, bool) {
216216
}
217217
}
218218
}
219-
220219
if len(result) == 0 {
221220
return result, false
222221
}
223-
224222
return result, true
225223
}

testData/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
This directory contains code from quic-go repo for
2+
- storing self signed certs
3+
- utility wrappers to populate cert pool for server and client
4+
File renamed without changes.

common/cert.go renamed to testData/cert.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package common
1+
package testData
22

33
import (
44
"crypto/tls"
File renamed without changes.

common/cert_test.go renamed to testData/cert_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package common
1+
package testData
22

33
import (
44
"crypto/tls"
File renamed without changes.

0 commit comments

Comments
 (0)