Changeset 165:4679ff581d6a in freeDiameter for freeDiameter/p_sr.c

Timestamp:

Jan 27, 2010, 10:56:54 AM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Fix invalid restore of the hop-by-hop id on forwarded answers

File:

• freeDiameter/p_sr.c (modified) (5 diffs)

freeDiameter/p_sr.c

@@ -44 +44 @@
         struct fd_list  chain;  /* the "o" field points directly to the hop-by-hop of the request (uint32_t *)  */
         struct msg      *req;   /* A request that was sent and not yet answered. */
+        uint32_t        prevhbh;/* The value to set in the hbh header when the message is retrieved */
 };
 
@@ -77 +78 @@
 
 /* Store a new sent request */
-int fd_p_sr_store(struct sr_list * srlist, struct msg **req, uint32_t *hbhloc)
+int fd_p_sr_store(struct sr_list * srlist, struct msg **req, uint32_t *hbhloc, uint32_t hbh_restore)
 {
         struct sentreq * sr;
@@ -83 +84 @@
         int match;
         
-        TRACE_ENTRY("%p %p %p", srlist, req, hbhloc);
+        TRACE_ENTRY("%p %p %p %x", srlist, req, hbhloc, hbh_restore);
         CHECK_PARAMS(srlist && req && *req && hbhloc);
         
@@ -90 +91 @@
         fd_list_init(&sr->chain, hbhloc);
         sr->req = *req;
+        sr->prevhbh = hbh_restore;
         
         /* Search the place in the list */
@@ -123 +125 @@
         sr = (struct sentreq *)find_or_next(&srlist->srs, hbh, &match);
         if (!match) {
-                TRACE_DEBUG(INFO, "There is no saved request with this hop-by-hop id");
+                TRACE_DEBUG(INFO, "There is no saved request with this hop-by-hop id (%x)", hbh);
                 *req = NULL;
         } else {
+                /* Restore hop-by-hop id */
+                *((uint32_t *)sr->chain.o) = sr->prevhbh;
                 /* Unlink */
                 fd_list_unlink(&sr->chain);