Skip to content

Commit 2ffc568

Browse files
committed
Added config
1 parent 98b5831 commit 2ffc568

File tree

4 files changed

+34
-19
lines changed

4 files changed

+34
-19
lines changed

DataChannelOrtc.Net/PeersListForm.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,7 @@ public PeersListForm()
2222

2323
lstPeers.SelectedIndex = -1;
2424

25-
var name = OrtcController.LocalPeer.Name;
26-
Debug.WriteLine($"Connecting to server from local peer: {name}");
27-
28-
_httpSignaler =
29-
new HttpSignaler("peercc-server.ortclib.org", 8888, name);
25+
_httpSignaler = new HttpSignaler();
3026

3127
_httpSignaler.SignedIn += Signaler_SignedIn;
3228
_httpSignaler.ServerConnectionFailed += Signaler_ServerConnectionFailed;

DataChannelOrtc.Xamarin/DataChannelOrtc/PeersListPage.xaml.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,7 @@ public PeersListPage()
2222
{
2323
InitializeComponent();
2424

25-
var name = OrtcController.LocalPeer.Name;
26-
Debug.WriteLine($"Connecting to server from local peer: {name}");
27-
28-
_httpSignaler =
29-
new HttpSignaler("peercc-server.ortclib.org", 8888, name);
25+
_httpSignaler = new HttpSignaler();
3026

3127
_httpSignaler.SignedIn += Signaler_SignedIn;
3228
_httpSignaler.ServerConnectionFailed += Signaler_ServerConnectionFailed;

Signaling/HttpSignaler.cs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ namespace DataChannelOrtc.Signaling
1515
/// </summary>
1616
public class HttpSignaler : HttpSignalerEvents
1717
{
18+
#region SignalingServerConfig
19+
private static string Url = "http://peercc-server.ortclib.org";
20+
private static int Port = 8888;
21+
#endregion
22+
1823
private readonly HttpClient _httpClient = new HttpClient();
1924
private State _state;
2025
private Uri _baseHttpAddress;
@@ -31,12 +36,12 @@ public class HttpSignaler : HttpSignalerEvents
3136
/// <param name="server">Host name/IP.</param>
3237
/// <param name="port">Port to connect.</param>
3338
/// <param name="client_name">Client name.</param>
34-
public HttpSignaler(string server, int port, string client_name)
39+
public HttpSignaler()
3540
{
3641
_state = State.NotConnected;
3742
_myId = -1;
38-
_clientName = client_name;
39-
_baseHttpAddress = new Uri("http://" + server + ":" + port);
43+
_clientName = OrtcController.LocalPeer.Name;
44+
_baseHttpAddress = new Uri(Url + ":" + Port);
4045
}
4146

4247
/// <summary>

Signaling/OrtcController.cs

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,16 @@
1111

1212
namespace DataChannelOrtc.Signaling
1313
{
14+
#region IceServersConfig
15+
static class IceServerConfig
16+
{
17+
public static string StunUrl = "stun.l.google.com:19302";
18+
public static string TurnUrl = "turn:turn-testdrive.cloudapp.net:3478?transport=udp";
19+
public static string TurnUsername = "redmond";
20+
public static string TurnCredential = "redmond123";
21+
}
22+
#endregion
23+
1424
public class OrtcController :
1525
OrtcControllerEvents,
1626
IDisposable
@@ -269,10 +279,17 @@ private async Task InitializeORTC()
269279
{
270280
IceServers = new List<RTCIceServer>()
271281
{
272-
new RTCIceServer { Urls = new string[] { "stun.l.google.com:19302" } },
273-
new RTCIceServer { Username = "redmond", Credential = "redmond123",
282+
new RTCIceServer
283+
{
284+
Urls = new string[] { IceServerConfig.StunUrl }
285+
},
286+
new RTCIceServer
287+
{
288+
Username = IceServerConfig.TurnUsername,
289+
Credential = IceServerConfig.TurnCredential,
274290
CredentialType = RTCIceCredentialType.Password,
275-
Urls = new string[] { "turn:turn-testdrive.cloudapp.net:3478?transport=udp" } }
291+
Urls = new string[] { IceServerConfig.TurnUrl }
292+
}
276293
}
277294
};
278295

@@ -289,12 +306,13 @@ private async Task InitializeORTC()
289306
OnSignalMessageToPeer(@event.Candidate.ToJson().ToString());
290307
};
291308

292-
var cert = await RTCCertificate.GenerateCertificate();
293-
294309
_ice = new RTCIceTransport(_gatherer);
295310
_ice.OnStateChange += IceTransport_OnStateChange;
296311

297-
_dtls = new RTCDtlsTransport(_ice, new RTCCertificate[] { cert });
312+
_dtls = new RTCDtlsTransport(_ice, new RTCCertificate[]
313+
{
314+
await RTCCertificate.GenerateCertificate()
315+
});
298316
_dtls.OnStateChange += Dtls_OnStateChange;
299317

300318
_sctp = new RTCSctpTransport(_dtls);

0 commit comments

Comments
 (0)