diff --git a/coreapi/TunnelManager.cc b/coreapi/TunnelManager.cc
index f992c0dd1..02fd650f1 100644
--- a/coreapi/TunnelManager.cc
+++ b/coreapi/TunnelManager.cc
@@ -65,8 +65,8 @@ void TunnelManager::reconnect(){
 		mTunnelClient->reconnect();
 }
 
-static void sCloseRtpTransport(RtpTransport *t, void *userData){
-	TunnelSocket *s=(TunnelSocket*)userData;
+static void sCloseRtpTransport(RtpTransport *t){
+	TunnelSocket *s=(TunnelSocket*)t->data;
 	TunnelManager *manager=(TunnelManager*)s->getUserPointer();
 	manager->closeRtpTransport(t, s);
 }
diff --git a/oRTP b/oRTP
index 7c55c0b6e..5b311fe7b 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 7c55c0b6e5d009f8186167a7e2a8bd956b08eb9e
+Subproject commit 5b311fe7b0d09002c8e595798566fe9cf6c26e34