** forwardport of revs 4762:4770 from 1.0 branch **

Author: Jakob Schröter

ChangeLog

@@ -10,6 +10,16 @@ Note: This release is not completely source compatible with previous versions.
 
 
 
+v1.0.20 -- 26 Feb 2017
+----------------------
+Note: This release is not binary compatible with previous releases. It is source compatible.
+
+- BytestreamDataHandler: added callback for acknowledged packets
+- ConnectionTCPClient: compile fix for Win32 (broken in 1.0.19)
+- ConnectionTCPClient: no-block fix
+
+
+
 v1.0.19 -- 21 Feb 2017
 ----------------------
 Note: This release is not binary compatible with previous releases. It is source compatible.

src/Makefile.am

@@ -46,7 +46,7 @@ libgloox_la_SOURCES = jid.cpp parser.cpp connectiontcpclient.cpp clientbase.cpp
                         carbons.cpp jinglepluginfactory.cpp jingleiceudp.cpp jinglefiletransfer.cpp \
                         iodata.cpp rosterx.cpp rosterxitemdata.cpp
 
-libgloox_la_LDFLAGS = -version-info 16:0:0 -no-undefined -no-allow-shlib-undefined
+libgloox_la_LDFLAGS = -version-info 17:0:0 -no-undefined -no-allow-shlib-undefined
 libgloox_la_LIBADD =
 libgloox_la_CFLAGS = $(CPPFLAGS)
 

src/bytestreamdatahandler.h

@@ -55,6 +55,17 @@ namespace gloox
        */
       virtual void handleBytestreamData( Bytestream* bs, const std::string& data ) = 0;
 
+      /**
+       * Reimplement this function to be notified when the remote end has
+       * received and acknowledged a single data packet. This packet may be
+       * smaller than the chunk that was fed into Bytream::send() due to internal
+       * chunk size limits. so this callback may be called multiple times for
+       * each call to Bytestream::send(). it can be used to implement burst limits.
+       * @param bs The bytestream.
+       * @since 1.0.20
+       */
+      virtual void handleBytestreamDataAck( Bytestream* bs ) {}
+      
       /**
        * Notifies about an error occuring while using a bytestream.
        * When this handler is called the stream has already been closed.

src/connectiontcpclient.cpp

@@ -137,9 +137,9 @@ namespace gloox
     }
 
 #if defined( _WIN32 ) && !defined( __SYMBIAN32__ )
-    int size = static_cast<int>( ::recv( m_socket, m_buf, m_bufsize ) );
-#else
     int size = static_cast<int>( ::recv( m_socket, m_buf, m_bufsize, 0 ) );
+#else
+    int size = static_cast<int>( ::recv( m_socket, m_buf, m_bufsize, MSG_DONTWAIT ) );
 #endif
     if( size > 0 )
       m_totalBytesIn += size;

src/glooxversion.h

@@ -11,3 +11,4 @@
 */
 
 #define GLOOXVERSION 0x010100
+

src/inbandbytestream.cpp

@@ -153,6 +153,10 @@ namespace gloox
           m_handler->handleBytestreamOpen( this );
           m_open = true;
         }
+        else if( context == IBBData && m_handler )
+        {
+          m_handler->handleBytestreamDataAck( this );
+        }
         break;
       case IQ::Error:
         closed();
@@ -187,13 +191,16 @@ namespace gloox
       return true;
     }
 
-    if( ( m_lastChunkReceived + 1 ) != i->seq() )
+    if( ++m_lastChunkReceived != i->seq() )
     {
       m_open = false;
       returnError( iq.from(), iq.id(), StanzaErrorTypeModify, StanzaErrorItemNotFound );
       return false;
     }
 
+    if( m_lastChunkReceived == 65535 )
+      m_lastChunkReceived = -1;
+
     if( i->data().empty() )
     {
       m_open = false;
@@ -203,7 +210,7 @@ namespace gloox
 
     returnResult( iq.from(), iq.id() );
     m_handler->handleBytestreamData( this, i->data() );
-    m_lastChunkReceived++;
+
     return true;
   }
 

src/inbandbytestream.h

@@ -54,15 +54,16 @@ namespace gloox
       virtual ~InBandBytestream();
 
       /**
-       * Lets you retrieve this bytestream's block-size.
+       * Lets you retrieve this bytestream's block-size. The default is 4096 bytes.
        * @return The bytestream's block-size.
        */
       int blockSize() const { return m_blockSize; }
 
       /**
-       * Sets the stream's block-size. Default: 4096
+       * Sets the stream's block-size. Default: 4096 bytes. Maximum allowed block-size: 65535 bytes
        * @param blockSize The new block size.
-       * @note You should not change the block size once connect() has been called.
+       * @note You should not change the block size once connect() has been called. Though neither
+       * the block-size limit nor changing it mid-stream are enforced by this function.
        */
       void setBlockSize( int blockSize ) { m_blockSize = blockSize; }
 

src/iqhandler.h

@@ -40,7 +40,7 @@ namespace gloox
        * Reimplement this function if you want to be notified about incoming IQs.
        * @param iq The complete IQ stanza.
        * @return Indicates whether a request of type 'get' or 'set' has been handled. This includes
-       * the obligatory 'result' answer. If you return @b false, an 'error' will be sent.
+       * the obligatory 'result' answer. If you return @b false, an 'error' will be sent back.
        * @since 1.0
        */
       virtual bool handleIq( const IQ& iq ) = 0;
@@ -49,7 +49,7 @@ namespace gloox
        * Reimplement this function if you want to be notified about
        * incoming IQs with a specific value of the @c id attribute. You
        * have to enable tracking of those IDs using Client::trackID().
-       * This is usually useful for IDs that generate a positive reply, i.e.
+       * This is usually useful for IDs that generate a empty positive reply, i.e.
        * <iq type='result' id='reg'/> where a namespace filter wouldn't
        * work.
        * @param iq The complete IQ stanza.