Changeset 1186:56c36d1007b4 in freeDiameter for libfdcore/p_out.c

Timestamp:

Jun 7, 2013, 7:48:34 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling.

File:

• libfdcore/p_out.c (modified) (8 diffs)

libfdcore/p_out.c

@@ -37 +37 @@
 
 /* Alloc a new hbh for requests, bufferize the message and send on the connection, save in sentreq if provided */
-static int do_send(struct msg ** msg, uint32_t flags, struct cnxctx * cnx, uint32_t * hbh, struct fd_peer * peer)
+static int do_send(struct msg ** msg, struct cnxctx * cnx, uint32_t * hbh, struct fd_peer * peer)
 {
         struct msg_hdr * hdr;
@@ -47 +47 @@
         struct msg *cpy_for_logs_only;
         
-        TRACE_ENTRY("%p %x %p %p %p", msg, flags, cnx, hbh, peer);
+        TRACE_ENTRY("%p %p %p %p", msg, cnx, hbh, peer);
         
         /* Retrieve the message header */
@@ -76 +76 @@
         
         /* Send the message */
-        CHECK_FCT_DO( ret = fd_cnx_send(cnx, buf, sz, flags), );
+        CHECK_FCT_DO( ret = fd_cnx_send(cnx, buf, sz), );
 out:
         ;       
@@ -128 +128 @@
                 
                 /* Send the message, log any error */
-                CHECK_FCT_DO( ret = do_send(&msg, 0, peer->p_cnxctx, &peer->p_hbh, peer),
+                CHECK_FCT_DO( ret = do_send(&msg, peer->p_cnxctx, &peer->p_hbh, peer),
                         {
                                 if (msg) {
@@ -149 +149 @@
 
 /* Wrapper to sending a message either by out thread (peer in OPEN state) or directly; cnx or peer must be provided. Flags are valid only for direct sending, not through thread (unused) */
-int fd_out_send(struct msg ** msg, struct cnxctx * cnx, struct fd_peer * peer, uint32_t flags)
+int fd_out_send(struct msg ** msg, struct cnxctx * cnx, struct fd_peer * peer)
 {
         struct msg_hdr * hdr;
         
-        TRACE_ENTRY("%p %p %p %x", msg, cnx, peer, flags);
+        TRACE_ENTRY("%p %p %p", msg, cnx, peer);
         CHECK_PARAMS( msg && *msg && (cnx || (peer && peer->p_cnxctx)));
         
@@ -182 +182 @@
 
                 /* Do send the message */
-                CHECK_FCT_DO( ret = do_send(msg, flags, cnx, hbh, peer),
+                CHECK_FCT_DO( ret = do_send(msg, cnx, hbh, peer),
                         {
                                 if (msg) {
@@ -205 +205 @@
         CHECK_POSIX( pthread_create(&peer->p_outthr, NULL, out_thr, peer) );
         
+        CHECK_FCT( fd_cnx_unordered_delivery(peer->p_cnxctx, 1) );
+        
         return 0;
 }
@@ -214 +216 @@
         CHECK_PARAMS( CHECK_PEER(peer) );
         
+        CHECK_FCT( fd_cnx_unordered_delivery(peer->p_cnxctx, 0) );
+        
         CHECK_FCT( fd_thr_term(&peer->p_outthr) );