Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(837)

Unified Diff: talk/media/sctp/sctpdataengine.h

Issue 1266033005: Added send-thresholding and fixed text packet dumping. Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Response to pthatcher@ comments. Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | talk/media/sctp/sctpdataengine.cc » ('j') | talk/media/sctp/sctpdataengine.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/media/sctp/sctpdataengine.h
diff --git a/talk/media/sctp/sctpdataengine.h b/talk/media/sctp/sctpdataengine.h
index 86bfa37a48c10dca4c3f5b0cad9a330d27aea10e..c849e36c377432a528847228d099973d30856d8c 100644
--- a/talk/media/sctp/sctpdataengine.h
+++ b/talk/media/sctp/sctpdataengine.h
@@ -64,6 +64,8 @@ const uint32 kMaxSctpSid = 1023;
// usrsctp.h)
const int kSctpDefaultPort = 5000;
+class SctpDataMediaChannel;
+
// A DataEngine that interacts with usrsctp.
//
// From channel calls, data flows like this:
@@ -94,7 +96,6 @@ class SctpDataEngine : public DataEngineInterface {
virtual ~SctpDataEngine();
virtual DataMediaChannel* CreateChannel(DataChannelType data_channel_type);
-
virtual const std::vector<DataCodec>& data_codecs() { return codecs_; }
private:
@@ -189,7 +190,9 @@ class SctpDataMediaChannel : public DataMediaChannel,
}
const std::string& debug_name() const { return debug_name_; }
+ const struct socket* socket() { return sock_; }
private:
+ static std::vector<SctpDataMediaChannel*> sock_channel_map_;
sockaddr_conn GetSctpSockAddr(int port);
// Creates the socket and connects. Sets sending_ to true.
@@ -222,6 +225,9 @@ class SctpDataMediaChannel : public DataMediaChannel,
void OnStreamResetEvent(const struct sctp_stream_reset_event* evt);
+ static int SendThresholdCallback(struct socket* sock, uint32_t sb_free);
+ static SctpDataMediaChannel* GetSctpChannel(struct socket* sock);
pthatcher1 2015/08/18 21:51:53 This looks like it's never called or implemented.
lally1 2015/08/24 15:46:39 Yup. Removed.
+
// Responsible for marshalling incoming data to the channels listeners, and
// outgoing data to the network interface.
rtc::Thread* worker_thread_;
« no previous file with comments | « no previous file | talk/media/sctp/sctpdataengine.cc » ('j') | talk/media/sctp/sctpdataengine.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698