Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Put in RPK and callbacks for supporting certificates #48

Merged
merged 11 commits into from
Jun 16, 2018
Merged

Put in RPK and callbacks for supporting certificates #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
52d5866
Merge remote-tracking branch 'refs/remotes/Com-AugustCellars/master'
jimsch Sep 11, 2017
295bd8f
Merge remote-tracking branch 'refs/remotes/Com-AugustCellars/master'
jimsch Sep 22, 2017
2aa9743
Merge remote-tracking branch 'upstream/master'
jimsch May 23, 2018
294f032
Merge remote-tracking branch 'upstream/master'
jimsch May 23, 2018
2597873
RPK seems to work now
jimsch Jun 2, 2018
f280804
Get more callback events
jimsch Jun 3, 2018
fe6c53b
Fix build problems
jimsch Jun 3, 2018
5ce3a53
Fixes for Raw Public Key not in the default BouncyCastle
jimsch Jun 3, 2018
3972cd4
Correct type
jimsch Jun 3, 2018
101a9bd
More compiler cleanup
jimsch Jun 3, 2018
ab35ed0
Make server notifications work
jimsch Jun 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions CoAP.NET/CoAP.NET45.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down Expand Up @@ -109,6 +109,7 @@
<Compile Include="DTLS\DtlsServer.cs" />
<Compile Include="DTLS\DTLSSession.cs" />
<Compile Include="DTLS\QueueItem.cs" />
<Compile Include="DTLS\TlsEvent.cs" />
<Compile Include="EmptyMessage.cs" />
<Compile Include="EndPoint\Resources\RemoteResource.cs" />
<Compile Include="EndPoint\Resources\Resource.cs" />
Expand Down Expand Up @@ -205,4 +206,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
14 changes: 14 additions & 0 deletions CoAP.NET/DTLS/DTLSChannel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ public class DTLSChannel : IChannel
private UDPChannel _udpChannel;
private KeySet _serverKeys;
private KeySet _userKeys;


public DTLSChannel(KeySet serverKeys, KeySet userKeys) : this(serverKeys, userKeys, 0)
{
Expand Down Expand Up @@ -86,6 +87,8 @@ public Int32 ReceivePacketSize {

private Int32 _running;

public EventHandler<TlsEvent> TlsEventHandler;

public void Start()
{
if (System.Threading.Interlocked.CompareExchange(ref _running, 1, 0) > 0) {
Expand Down Expand Up @@ -164,6 +167,7 @@ public ISession GetSession(System.Net.EndPoint ep)

session = new DTLSSession(ipEndPoint, DataReceived, _serverKeys, _userKeys);
AddSession(session);
session.TlsEventHandler += MyTlsEventHandler;


session.Connect(_udpChannel);
Expand All @@ -175,6 +179,14 @@ public ISession GetSession(System.Net.EndPoint ep)
return session;
}

private void MyTlsEventHandler(Object o, TlsEvent e)
{
EventHandler<TlsEvent> handler = TlsEventHandler;
if (handler != null) {
handler(o, e);
}
}

public void Send(byte[] data, ISession sessionReceive, System.Net.EndPoint ep)
{
try {
Expand All @@ -184,6 +196,7 @@ public void Send(byte[] data, ISession sessionReceive, System.Net.EndPoint ep)
if (session == null) {

session = new DTLSSession(ipEP, DataReceived, _serverKeys, _userKeys);
session.TlsEventHandler += MyTlsEventHandler;
AddSession(session);
session.Connect(_udpChannel);
}
Expand Down Expand Up @@ -211,6 +224,7 @@ private void ReceiveData(Object sender, DataReceivedEventArgs e)
}

DTLSSession sessionNew = new DTLSSession((IPEndPoint) e.EndPoint, DataReceived, _serverKeys, _userKeys);
sessionNew.TlsEventHandler = MyTlsEventHandler;
_sessionList.Add(sessionNew);
new Thread(() => Accept(sessionNew, e.Data)).Start();
}
Expand Down
Loading