Changeset 1103:d8591b1c56cd in freeDiameter for libfdcore/p_out.c

Timestamp:

May 10, 2013, 7:48:57 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Implemented a few hooks

File:

• libfdcore/p_out.c (modified) (6 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 sr_list * srl)
+static int do_send(struct msg ** msg, uint32_t flags, struct cnxctx * cnx, uint32_t * hbh, struct fd_peer * peer)
 {
         struct msg_hdr * hdr;
@@ -45 +45 @@
         int ret;
         uint32_t bkp_hbh = 0;
-        
-        TRACE_ENTRY("%p %x %p %p %p", msg, flags, cnx, hbh, srl);
+        struct msg *cpy_for_logs_only;
+        
+        TRACE_ENTRY("%p %x %p %p %p", msg, flags, cnx, hbh, peer);
         
         /* Retrieve the message header */
@@ -53 +54 @@
         msg_is_a_req = (hdr->msg_flags & CMD_FLAG_REQUEST);
         if (msg_is_a_req) {
-                CHECK_PARAMS(hbh && srl);
+                CHECK_PARAMS(hbh && peer);
                 /* Alloc the hop-by-hop id and increment the value for next message */
                 bkp_hbh = hdr->msg_hbhid;
@@ -64 +65 @@
         pthread_cleanup_push( free, buf );
         
-        // cpy_for_logs_only = *msg;
+        cpy_for_logs_only = *msg;
         
         /* Save a request before sending so that there is no race condition with the answer */
         if (msg_is_a_req) {
-                CHECK_FCT_DO( ret = fd_p_sr_store(srl, msg, &hdr->msg_hbhid, bkp_hbh), goto out );
+                CHECK_FCT_DO( ret = fd_p_sr_store(&peer->p_sr, msg, &hdr->msg_hbhid, bkp_hbh), goto out );
         }
         
         /* Log the message */
-        // fd_msg_log( FD_MSG_LOG_SENT, cpy_for_logs_only, "Sent to '%s'", fd_cnx_getid(cnx));
+        fd_hook_call(HOOK_MESSAGE_SENT, cpy_for_logs_only, peer, NULL, fd_msg_pmdl_get(cpy_for_logs_only));
         
         /* Send the message */
@@ -127 +128 @@
                 
                 /* Send the message, log any error */
-                CHECK_FCT_DO( ret = do_send(&msg, 0, peer->p_cnxctx, &peer->p_hbh, &peer->p_sr),
+                CHECK_FCT_DO( ret = do_send(&msg, 0, peer->p_cnxctx, &peer->p_hbh, peer),
                         {
                                 if (msg) {
@@ -179 +180 @@
 
                 /* Do send the message */
-                CHECK_FCT_DO( ret = do_send(msg, flags, cnx, hbh, peer ? &peer->p_sr : NULL),
+                CHECK_FCT_DO( ret = do_send(msg, flags, cnx, hbh, peer),
                         {
                                 if (msg) {