[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/soc-kopete-jingle/kopete/protocols/jabber
From:       Detlev Casanova <detlev.casanova () gmail ! com>
Date:       2008-08-18 10:20:21
Message-ID: 1219054821.748543.11698.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 848663 by casanova:

 * Added some Documentation. (jinglecontent.h)


 M  +5 -0      jingle/jinglertpsession.cpp  
 M  +65 -2     libiris/iris/jabber/jinglecontent.h  
 M  +2 -1      libiris/iris/jabber/jinglesession.h  


--- branches/work/soc-kopete-jingle/kopete/protocols/jabber/jingle/jinglertpsession.cpp \
#848662:848663 @@ -89,6 +89,11 @@
 		rtcpSocket->connectToHost(rtpSocket->peerAddress(), rtcpPort == 0 ? \
rtpSocket->peerPort() + 1 : rtcpPort, QIODevice::ReadWrite);  }
 	rtp_session_set_sockets(m_rtpSession, rtpSocket->socketDescriptor(), \
rtcpSocket->socketDescriptor()); +	
+	//This line seem to cause problems and make data not come in properly.
+	//From netstat, I can see that the socket receives about 98000 bytes then, do \
nothing. +	//Never a slot that should be called when data is received is called.
+	//This is a blocant problem as data is sent but never received.
 }
 
 /*void JingleRtpSession::bind(int rtpPort, int rtcpPort)
--- branches/work/soc-kopete-jingle/kopete/protocols/jabber/libiris/iris/jabber/jinglecontent.h \
#848662:848663 @@ -51,25 +51,88 @@
 		 * Sets the transport for this content.
 		 */
 		void setTransport(const QDomElement&);
+
+		/*
+		 * Set the content type, this will set the "media" attribute of
+		 * the content tag in the stanza.
+		 */
 		void setType(Type);
+
+		/*
+		 * Gets the type of this content.
+		 */
 		Type type() const;
+
+		/*
+		 * Set the creator of this content, the creator only accept 2 values :
+		 * 	* initiator
+		 * 	* responder
+		 * TODO:An enum should be created to avoid confusion
+		 */
 		void setCreator(const QString&);
+		
+		/*
+		 * Set this content's name
+		 */
 		void setName(const QString&);
+
+		/*
+		 * Set this content description namespace.
+		 * The only one supported currently is
+		 * 	NS
+		 */
 		void setDescriptionNS(const QString&);
 
+		/*
+		 * Returns the payload type list. those payloads are
+		 * our payloads if in Pending state or the content
+		 * used payloads if in Active state. (TODO)
+		 */
 		QList<QDomElement> payloadTypes() const;
+
+		/*
+		 * Returns the transport XML element for this content.
+		 */
 		QDomElement transport() const;
+
+		/*
+		 * Fill this content from a QDomElement.
+		 * The payloads in this QDomElement will be considered as the responder's
+		 * TODO:add an argument to telml the method if those payloads are ours or
+		 * responder's payloads.
+		 */
 		void fromElement(const QDomElement&);
+
+		/*
+		 * Return a QDomElement with the content element and all it's children
+		 * so it's ready to be sent.
+		 */
 		QDomElement contentElement();
+
+		/*
+		 * Returns a list with the available candidates for this content.
+		 * TODO:should return the used candidate when in Active state.
+		 */
 		QList<QDomElement> candidates() const;
+
+		/*
+		 * Adds a candidate to this content. Doing so will add this content(s)
+		 * to the transport when calling contentElement()
+		 */
 		void addCandidate(const QDomElement&);
+		
+		/*
+		 * Adds transport info (mostly a candidate). Doing so will try to
+		 * connect to this candidate.
+		 */
+		void addTransportInfo(const QDomElement&);
+		void createUdpInSocket();
+		
 		QString creator() const;
 		QString name() const;
 		QString descriptionNS() const;
-		void addTransportInfo(const QDomElement&);
 		QString iceUdpPassword();
 		QString iceUdpUFrag();
-		void createUdpInSocket();
 		QUdpSocket *inSocket();
 		QUdpSocket *outSocket();
 		bool sending();
--- branches/work/soc-kopete-jingle/kopete/protocols/jabber/libiris/iris/jabber/jinglesession.h \
#848662:848663 @@ -202,7 +202,8 @@
 
 		/*
 		 * Call this function when a session-accept jingle action has been received for \
                it.
-		 * More... (what will happen ? looooooooots of things with contents,...)
+		 * Once the session is accepted, we will get the supported payloads of the \
initiator +		 * and switch to Active state, Media can begin to flow on each content's \
                socket.
 		 */
 		void sessionAccepted(const QDomElement&);
 


[prev in list] [next in list] [prev in thread] [next in thread]