Skip to content
This repository was archived by the owner on Oct 23, 2024. It is now read-only.

Commit b24bf33

Browse files
jianjunzjianjunz
committed
Clean up.
1 parent b2198c6 commit b24bf33

File tree

12 files changed

+49
-168
lines changed

12 files changed

+49
-168
lines changed

‎doc/servermd/quic.md

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎scripts/build.json

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,8 @@
5151
},
5252
"mcu-quic": {
5353
"include":[
54-
"video-mixer-sw",
55-
"video-transcoder-sw",
56-
"video-analyzer-sw",
57-
"internal-io",
58-
"logger",
59-
"media-frame-multicaster",
60-
"audio",
61-
"webrtc-quic",
62-
"avstream",
63-
"sip"
54+
"mcu",
55+
"quic"
6456
]
6557
},
6658
"video-mixer-sw" : {

‎source/agent/addons/quic/binding.gyp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
'../../../core/common',
3939
'../../../core/owt_base',
4040
'../../../../build/libdeps/build/include',
41+
# TODO: Fix it when CI for QUIC SDK is ready.
4142
'/home/jianjunz/code/quic/src/owt/quic_transport/api',
4243
'<!@(pkg-config glib-2.0 --cflags-only-I | sed s/-I//g)',
4344
],

‎source/agent/addons/quic/test/log4cxx.properties

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -96,16 +96,13 @@ log4j.logger.SdpInfo=WARN
9696
log4j.logger.SrtpChannel=WARN
9797
log4j.logger.Stats=WARN
9898
log4j.logger.WebRtcConnection=WARN
99-
log4j.logger.IceConnection=DEBUG
99+
log4j.logger.IceConnection=INFO
100100

101101
log4j.logger.dtls.DtlsSocket=WARN
102102
log4j.logger.dtls.DtlsFactory=WARN
103103
log4j.logger.dtls.DtlsSocketContext=WARN
104104
log4j.logger.dtls.SSL=WARN
105105

106-
log4j.logger.RTCCertificate=DEBUG
107-
log4j.logger.RTCIceTransport=DEBUG
108-
log4j.logger.RTCQuicTransport=DEBUG
109-
log4j.logger.LibNiceConnection=DEBUG
110-
log4j.logger.QuicFactory=DEBUG
111-
log4j.logger.QuicTransportServer=DEBUG
106+
# QUIC
107+
log4j.logger.QuicFactory=INFO
108+
log4j.logger.QuicTransportServer=INFO

‎source/agent/quic/agent.toml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,3 @@ network_interfaces = [] # default: []
5555

5656
keystorePath = "./cert/certificate.pfx"
5757
#note, this won't work with all versions of libnice. With 0 all the available ports are used
58-
59-
# ICE port range
60-
maxport = 0 #default: 0
61-
minport = 0 #default: 0
62-
63-
#STUN server IP address and port to be used by the server.
64-
#if "" is used, the address is discovered locally
65-
stunport = 0 #default: 0
66-
stunserver = "" #default: ""
67-
68-
#ThreadPool worker numbers for peer connection
69-
num_workers = 24 #default: 24

‎source/agent/quic/configLoader.js

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -48,26 +48,6 @@ module.exports.load = () => {
4848
config.internal.ip_address = addr.ip;
4949
}
5050

51-
config.webrtc = config.webrtc || {};
52-
config.webrtc.stunserver = config.webrtc.stunserver || '';
53-
config.webrtc.stunport = config.webrtc.stunport || 0;
54-
config.webrtc.minport = config.webrtc.minport || 0;
55-
config.webrtc.maxport = config.webrtc.maxport || 0;
56-
config.webrtc.keystorePath = config.webrtc.keystorePath || '';
57-
config.webrtc.num_workers = config.webrtc.num_workers || 24;
58-
config.webrtc.use_nicer = config.webrtc.use_nicer || false;
59-
config.webrtc.io_workers = config.webrtc.io_workers || 1;
60-
config.webrtc.network_interfaces = config.webrtc.network_interfaces || [];
61-
62-
config.webrtc.network_interfaces.forEach(item => {
63-
let addr = networkHelper.getAddress(item.name);
64-
if (!addr) {
65-
console.error("Can't get webrtc IP address");
66-
process.exit(1);
67-
}
68-
item.ip_address = addr.ip;
69-
});
70-
7151
return config;
7252
} catch (e) {
7353
console.error('Parsing config error on line ' + e.line + ', column ' + e.column + ': ' + e.message);

‎source/agent/quic/log4cxx.properties

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -86,28 +86,8 @@ log4j.logger.mcu.media.MsdkVideoCompositor.MsdkInput=INFO
8686
log4j.logger.mcu.media.MsdkVideoCompositor.MsdkVpp=INFO
8787
log4j.logger.mcu.media.MsdkVideoCompositor.MsdkFrameGenerator=INFO
8888

89-
# Webrtc
90-
log4j.logger.DtlsTransport=WARN
91-
log4j.logger.LibNiceConnection=WARN
92-
log4j.logger.NicerConnection=WARN
93-
log4j.logger.OneToManyProcessor=WARN
94-
log4j.logger.Resender=WARN
95-
log4j.logger.SdpInfo=WARN
96-
log4j.logger.SrtpChannel=WARN
97-
log4j.logger.Stats=WARN
98-
log4j.logger.WebRtcConnection=WARN
99-
log4j.logger.IceConnection=DEBUG
100-
101-
log4j.logger.dtls.DtlsSocket=WARN
102-
log4j.logger.dtls.DtlsFactory=WARN
103-
log4j.logger.dtls.DtlsSocketContext=WARN
104-
log4j.logger.dtls.SSL=WARN
105-
106-
log4j.logger.RTCCertificate=DEBUG
107-
log4j.logger.RTCIceTransport=DEBUG
108-
log4j.logger.RTCQuicTransport=DEBUG
109-
log4j.logger.LibNiceConnection=DEBUG
110-
log4j.logger.QuicFactory=DEBUG
111-
log4j.logger.QuicTransportServer=DEBUG
112-
log4j.logger.QuicTransportConnection=DEBUG
113-
log4j.logger.QuicTransportStream=DEBUG
89+
# QUIC
90+
log4j.logger.QuicFactory=INFO
91+
log4j.logger.QuicTransportServer=INFO
92+
log4j.logger.QuicTransportConnection=INFO
93+
log4j.logger.QuicTransportStream=INFO

‎source/agent/quic/log4js_configuration.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@
1010
}
1111
],
1212
"levels": {
13-
"ClusterWorker": "INFO",
14-
"LoadCollector": "INFO",
15-
"AmqpClient": "INFO",
16-
"WorkingJS": "INFO",
17-
"NodeManager": "INFO",
18-
"QuicNode": "DEBUG",
13+
"ClusterWorker": "WARN",
14+
"LoadCollector": "WARN",
15+
"AmqpClient": "WARN",
16+
"WorkingJS": "WARN",
17+
"NodeManager": "WARN",
18+
"QuicNode": "INFO",
1919
"Connection": "WARN",
20-
"WorkingAgent": "INFO",
21-
"Connections": "DEBUG",
22-
"InternalConnectionFactory": "INFO",
23-
"QuicConnection": "DEBUG",
24-
"QuicTransportServer": "DEBUG",
25-
"QuicTransportStreamPipeline": "DEBUG"
20+
"WorkingAgent": "WARN",
21+
"Connections": "WARN",
22+
"InternalConnectionFactory": "WARN",
23+
"QuicConnection": "WARN",
24+
"QuicTransportServer": "WARN",
25+
"QuicTransportStreamPipeline": "WARN"
2626
}
2727
}

‎source/agent/quic/readme.md

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,24 @@ QUIC agent basically provides the network connections for client to send data to
1111

1212
In the future, all data needs to be sent to or received from client will be able to go through QUIC agent. It includes but not limited to signaling messages, media data.
1313

14-
## Coding Style
14+
## Quick Start
15+
16+
QUIC agent is not enabled by default. It's still an experimental feature. To enable QUIC agent, please run `scripts/build.js -t quic` and pack QUIC agent by explictly adding quic-agent as a target.
17+
18+
## Development
19+
20+
### Build OWT QUIC SDK
21+
22+
OWT QUIC SDK is a Chromium based project. However, it is not publicly available right now. Please follow internal instructions in QUIC SDK repo to build it.
23+
24+
### Coding Style
1525

1626
Existing code in conference server seems to use mixed coding styles, QUIC agent follows WebKit style for C++ code because the `.clang-format` file in the root directory instructs us to do so, and Chromium style for JavaScript code. Global namespace is used for C++ code because most other C++ classes in conference server use it as well. Please consider to define a namespace for conference server.
1727

18-
## Issues
28+
### Issues
29+
30+
The development of QUIC agent is actively working in progress. Please file a bug on [GitHub](https://github.com/open-webrtc-toolkit/owt-server/issues) if something doesn't work as expected.
31+
32+
### Testing
1933

20-
The development of QUIC agent is actively working in progress. Please file a bug on [GitHub](https://github.com/open-webrtc-toolkit/owt-server/issues) if something doesn't work as expected.
34+
Run `npm test` in QUIC agent.

‎source/agent/quic/webtransport/test/quicTransportServerTest.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,13 @@ describe('Test QuicTransportServer.', () => {
5353
});
5454

5555
it('Test UUID convertions.',
56-
() => {
56+
(done) => {
57+
const uuidString0='';
58+
const uuidString1='';
59+
const uuidString2='';
60+
const uuidArray0='';
61+
const uuidArray1='';
62+
const uuidArray2='';
63+
done();
5764
});
5865
});

0 commit comments

Comments
 (0)