Pre-Submission Checklist

Commit message has the format required by CONTRIBUTING guide
Commits are split per component (core, individual modules, libs, utils, ...)
Each component has a single commit (if not, squash them into one commit)
No commits to README files for modules (changes must be done to docbook files
in doc/ subfolder, the README file is autogenerated)

Type Of Change

Small bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds new functionality)
Breaking change (fix or feature that would change existing functionality)

Checklist:

PR should be backported to stable branches
Tested changes locally
Related to issue #3653

Description

Contacts are now added at the end of the list.
hfl(Contact)[index] is now returning in the correct order.

Currently, if a sip message contains multiple Contacts or just 2, let's say

Contact: <sip:bob0@example.com>;expires=3600,<sip:bob1@example.com>;expires=3600,<sip:bob2@example.com>;expires=3600
Contact: <sip:bob3@example.com>;expires=3600,<sip:bob4@example.com>;expires=3600,<sip:bob5@example.com>;expires=3600

contacts are stored in the reversed order, ie bob2, bob1,bob0 and bob5,bob4,bob3.

This can be seen with a simple config file such as:

#kamailio.cfg
...
request_route {
    ...
	xlog("L_INFO", "Contact headers: $hfl(Contact)\n");
	xlog("L_INFO", "Contact headers 0: $(hfl(Contact)[0])\n");
	xlog("L_INFO", "Contact headers 1: $(hfl(Contact)[1])\n");
	xlog("L_INFO", "Contact headers 2: $(hfl(Contact)[2])\n");
	xlog("L_INFO", "Contact headers 3: $(hfl(Contact)[3])\n");
	xlog("L_INFO", "Contact headers 4: $(hfl(Contact)[4])\n");
	xlog("L_INFO", "Contact headers 5: $(hfl(Contact)[5])\n");
	xlog("L_INFO", "Contact headers 6: $(hfl(Contact)[6])\n");
	xlog("L_INFO", "Contact headers 7: $(hfl(Contact)[7])\n");
	xlog("L_INFO", "Contact headers -1: $(hfl(Contact)[-1])\n");
	xlog("L_INFO", "Contact headers -2: $(hfl(Contact)[-2])\n");
	xlog("L_INFO", "Contact headers -3: $(hfl(Contact)[-3])\n");
	xlog("L_INFO", "Contact headers -4: $(hfl(Contact)[-4])\n");
	xlog("L_INFO", "Contact headers -5: $(hfl(Contact)[-5])\n");
	xlog("L_INFO", "Contact headers -6: $(hfl(Contact)[-6])\n");

that prints in the log all the contacts reversed:

Contact headers: <sip:bob2@example.com>;expires=3600
Contact headers 0: <sip:bob2@example.com>;expires=3600
Contact headers 1: <sip:bob1@example.com>;expires=3600
Contact headers 2: <sip:bob0@example.com>;expires=3600
Contact headers 3: <sip:bob5@example.com>;expires=3600
Contact headers 4: <sip:bob4@example.com>;expires=3600
Contact headers 5: <sip:bob3@example.com>;expires=3600
Contact headers 6: <null>
Contact headers 7: <null>
Contact headers -1: <sip:bob3@example.com>;expires=3600
Contact headers -2: <sip:bob4@example.com>;expires=3600
Contact headers -3: <sip:bob5@example.com>;expires=3600
Contact headers -4: <sip:bob0@example.com>;expires=3600
Contact headers -5: <sip:bob1@example.com>;expires=3600
Contact headers -6: <sip:bob2@example.com>;expires=3600

This PR fixes and produces:

Contact headers: <sip:bob0@example.com>;expires=3600
Contact headers 0: <sip:bob0@example.com>;expires=3600
Contact headers 1: <sip:bob1@example.com>;expires=3600
Contact headers 2: <sip:bob2@example.com>;expires=3600
Contact headers 3: <sip:bob3@example.com>;expires=3600
Contact headers 4: <sip:bob4@example.com>;expires=3600
Contact headers 5: <sip:bob5@example.com>;expires=3600
Contact headers 6: <null>
Contact headers 7: <null>
Contact headers -1: <null>
Contact headers -2: <sip:bob5@example.com>;expires=3600
Contact headers -3: <sip:bob4@example.com>;expires=3600
Contact headers -4: <sip:bob3@example.com>;expires=3600
Contact headers -5: <sip:bob2@example.com>;expires=3600
Contact headers -6: <sip:bob1@example.com>;expires=3600

The contact headers -1: <null> if fixed via #3697.

You can view, comment on, or merge this pull request online at:

https://github.com/kamailio/kamailio/pull/3698

Commit Summary

ede6a0b parser/contact: Change addition order to the end of list

File Changes

(1 file)

M src/core/parser/contact/contact.c (4)

Patch Links:

—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.