Skip to content

Commit f7621a0

Browse files
author
evgeny-nadymov
committed
Move ufrag/pwd from media to session level
1 parent 2dcbf8d commit f7621a0

10 files changed

+60
-1078
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"homepage": "https://evgeny-nadymov.github.io/telegram-react",
33
"name": "telegram_react",
4-
"version": "0.0.971",
4+
"version": "0.0.973",
55
"private": true,
66
"dependencies": {
77
"tdweb": "^1.7.2",

src/Calls/P2P/ChromeP2PSdpBuilder.js

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {addExtmap, addPayloadTypes, addSsrc} from './P2PSdpBuilder';
99

1010
export class ChromeP2PSdpBuilder {
1111
static generateOffer(info) {
12-
const { sessionId, fingerprints, media } = info;
12+
const { sessionId, fingerprints, ufrag, pwd, media } = info;
1313

1414
let sdp = `v=0
1515
o=- ${sessionId} 2 IN IP4 127.0.0.1
@@ -23,6 +23,11 @@ a=fingerprint:${hash} ${fingerprint}
2323
a=setup:${setup}`;
2424
});
2525
}
26+
if (ufrag && pwd) {
27+
sdp += `
28+
a=ice-ufrag:${ufrag}
29+
a=ice-pwd:${pwd}`;
30+
}
2631

2732
sdp += `
2833
a=group:BUNDLE ${media.map(x => x.mid).join(' ')}
@@ -38,8 +43,6 @@ a=msid-semantic: WMS *`;
3843
sdp += `
3944
m=application 9 UDP/DTLS/SCTP webrtc-datachannel
4045
c=IN IP4 0.0.0.0
41-
a=ice-ufrag:${ufrag}
42-
a=ice-pwd:${pwd}
4346
a=ice-options:trickle
4447
a=mid:${mid}
4548
a=sctp-port:${port}
@@ -51,8 +54,6 @@ a=max-message-size:${maxSize}`;
5154
m=audio 56930 UDP/TLS/RTP/SAVPF ${types.map(x => x.id).join(' ')}
5255
c=IN IP4 0.0.0.0
5356
a=rtcp:9 IN IP4 0.0.0.0
54-
a=ice-ufrag:${ufrag}
55-
a=ice-pwd:${pwd}
5657
a=ice-options:trickle
5758
a=mid:${mid}`;
5859
sdp += addExtmap(extmap);
@@ -76,8 +77,6 @@ a=rtcp-mux`;
7677
m=video 61986 UDP/TLS/RTP/SAVPF ${types.map(x => x.id).join(' ')}
7778
c=IN IP4 0.0.0.0
7879
a=rtcp:9 IN IP4 0.0.0.0
79-
a=ice-ufrag:${ufrag}
80-
a=ice-pwd:${pwd}
8180
a=ice-options:trickle
8281
a=mid:${mid}`;
8382
sdp += addExtmap(extmap);
@@ -105,7 +104,7 @@ a=rtcp-rsize`;
105104
}
106105

107106
static generateAnswer(info) {
108-
const { sessionId, fingerprints, media } = info;
107+
const { sessionId, fingerprints, ufrag, pwd, media } = info;
109108

110109
let sdp = `v=0
111110
o=- ${sessionId} 2 IN IP4 127.0.0.1
@@ -119,6 +118,12 @@ a=fingerprint:${hash} ${fingerprint}
119118
a=setup:${setup}`;
120119
});
121120
}
121+
if (ufrag && pwd) {
122+
sdp += `
123+
a=ice-ufrag:${ufrag}
124+
a=ice-pwd:${pwd}`;
125+
}
126+
122127
sdp += `
123128
a=group:BUNDLE ${media.map(x => x.mid).join(' ')}
124129
a=extmap-allow-mixed
@@ -133,8 +138,6 @@ a=msid-semantic: WMS *`;
133138
sdp += `
134139
m=application 9 UDP/DTLS/SCTP webrtc-datachannel
135140
c=IN IP4 0.0.0.0
136-
a=ice-ufrag:${ufrag}
137-
a=ice-pwd:${pwd}
138141
a=ice-options:trickle
139142
a=mid:${mid}
140143
a=sctp-port:${port}
@@ -146,8 +149,6 @@ a=max-message-size:${maxSize}`;
146149
m=audio 56930 UDP/TLS/RTP/SAVPF ${types.map(x => x.id).join(' ')}
147150
c=IN IP4 0.0.0.0
148151
a=rtcp:9 IN IP4 0.0.0.0
149-
a=ice-ufrag:${ufrag}
150-
a=ice-pwd:${pwd}
151152
a=ice-options:trickle
152153
a=mid:${mid}`;
153154
sdp += addExtmap(extmap);
@@ -170,8 +171,6 @@ a=rtcp-mux`;
170171
m=video 61986 UDP/TLS/RTP/SAVPF ${types.map(x => x.id).join(' ')}
171172
c=IN IP4 0.0.0.0
172173
a=rtcp:9 IN IP4 0.0.0.0
173-
a=ice-ufrag:${ufrag}
174-
a=ice-pwd:${pwd}
175174
a=ice-options:trickle
176175
a=mid:${mid}`;
177176
sdp += addExtmap(extmap);

0 commit comments

Comments
 (0)