<h4 dir="auto">Pre-Submission Checklist</h4>
<ul class="contains-task-list">
<li class="task-list-item"><input type="checkbox" id="" disabled="" class="task-list-item-checkbox" checked=""> Commit message has the format required by CONTRIBUTING guide</li>
<li class="task-list-item"><input type="checkbox" id="" disabled="" class="task-list-item-checkbox" checked=""> Commits are split per component (core, individual modules, libs, utils, ...)</li>
<li class="task-list-item"><input type="checkbox" id="" disabled="" class="task-list-item-checkbox" checked=""> Each component has a single commit (if not, squash them into one commit)</li>
<li class="task-list-item"><input type="checkbox" id="" disabled="" class="task-list-item-checkbox" checked=""> No commits to README files for modules (changes must be done to docbook files<br>
in <code class="notranslate">doc/</code> subfolder, the README file is autogenerated)</li>
</ul>
<h4 dir="auto">Type Of Change</h4>
<ul class="contains-task-list">
<li class="task-list-item"><input type="checkbox" id="" disabled="" class="task-list-item-checkbox"> Small bug fix (non-breaking change which fixes an issue)</li>
<li class="task-list-item"><input type="checkbox" id="" disabled="" class="task-list-item-checkbox" checked=""> New feature (non-breaking change which adds new functionality)</li>
<li class="task-list-item"><input type="checkbox" id="" disabled="" class="task-list-item-checkbox"> Breaking change (fix or feature that would change existing functionality)</li>
</ul>
<h4 dir="auto">Checklist:</h4>
<ul class="contains-task-list">
<li class="task-list-item"><input type="checkbox" id="" disabled="" class="task-list-item-checkbox"> PR should be backported to stable branches</li>
<li class="task-list-item"><input type="checkbox" id="" disabled="" class="task-list-item-checkbox" checked=""> Tested changes locally</li>
<li class="task-list-item"><input type="checkbox" id="" disabled="" class="task-list-item-checkbox"> Related to issue #XXXX (replace XXXX with an open issue number)</li>
</ul>
<h4 dir="auto">Description</h4>
<p dir="auto">Right now the <code class="notranslate">presence_reginfo</code> module does not perform any aggregation on presentities from the same AoR. While this is generally ok for new notifies driven by new publishes, when a new subscription is received only the most recent presentity is notified. This PR adds a new parameter, disabled by default to preserve compatibility, which merges all presentities for the same AoR into a single document.</p>
<p dir="auto">For example, two registrations from the same AoR will create the following document:</p>
<div class="snippet-clipboard-content notranslate position-relative overflow-auto" data-snippet-clipboard-copy-content="<reginfo xmlns="urn:ietf:params:xml:ns:reginfo" version="23" state="full">
<registration aor="sip:user2@example.com" id="0x7f9b6bbf9cf8" state="active">
<contact id="0x7f9b6bbf3ea8" state="active" event="created" expires="300" callid="23439394725296-103541137625012@192.168.10.130" cseq="38" received="" path="<sip:172.23.42.1;lr;received=sip:uac.public.ip:60015;r2=on>,<sip:kamailio.public.ip;lr;received=sip:uac.public.ip:60015;r2=on>" user_agent="MyUA 1.2.3.4">
<uri>sip:user2@192.168.10.130:5060</uri>
</contact>
</registration>
<registration aor="sip:user2@example.com" id="0x7f46836f63b8" state="active">
<contact id="0x7f46836f64e0" state="active" event="refreshed" expires="300" callid="15796302815379-26687127665413@192.168.10.130" cseq="38" received="" path="<sip:172.23.42.1;lr;received=sip:uac.public.ip:5099;r2=on>,<sip:kamailio.public.ip;lr;received=sip:uac.public.ip:5099;r2=on>" user_agent="MyUA 1.2.3.4">
<uri>sip:user2@192.168.10.130:5099</uri>
</contact>
</registration>
</reginfo>"><pre lang="<?xml" class="notranslate notranslate"><code><reginfo xmlns="urn:ietf:params:xml:ns:reginfo" version="23" state="full">
<registration aor="sip:user2@example.com" id="0x7f9b6bbf9cf8" state="active">
<contact id="0x7f9b6bbf3ea8" state="active" event="created" expires="300" callid="23439394725296-103541137625012@192.168.10.130" cseq="38" received="" path="<sip:172.23.42.1;lr;received=sip:uac.public.ip:60015;r2=on>,<sip:kamailio.public.ip;lr;received=sip:uac.public.ip:60015;r2=on>" user_agent="MyUA 1.2.3.4">
<uri>sip:user2@192.168.10.130:5060</uri>
</contact>
</registration>
<registration aor="sip:user2@example.com" id="0x7f46836f63b8" state="active">
<contact id="0x7f46836f64e0" state="active" event="refreshed" expires="300" callid="15796302815379-26687127665413@192.168.10.130" cseq="38" received="" path="<sip:172.23.42.1;lr;received=sip:uac.public.ip:5099;r2=on>,<sip:kamailio.public.ip;lr;received=sip:uac.public.ip:5099;r2=on>" user_agent="MyUA 1.2.3.4">
<uri>sip:user2@192.168.10.130:5099</uri>
</contact>
</registration>
</reginfo>
</code></pre></div>
<p dir="auto">Example of a body with two registrations with different bodies:</p>
<div class="snippet-clipboard-content notranslate position-relative overflow-auto" data-snippet-clipboard-copy-content="<?xml version="1.0"?>
<reginfo xmlns="urn:ietf:params:xml:ns:reginfo" version="21" state="full">
<registration aor="sip:user2@example.com" id="0x7f9b6bc55540" state="terminated"/>
<registration aor="sip:user2@example.com" id="0x7f46836f63b8" state="active">
<contact id="0x7f46836f64e0" state="active" event="refreshed" expires="300" callid="15796302815379-26687127665413@192.168.10.130" cseq="36" received="" path="<sip:172.23.42.1;lr;received=sip:uac.public.ip:5099;r2=on>,<sip:kamailio.public.ip;lr;received=sip:uac.public.ip:5099;r2=on>" user_agent="MyUA 1.2.3.4">
<uri>sip:user2@192.168.10.130:5099</uri>
</contact>
</registration>
</reginfo>"><pre class="notranslate notranslate"><code><?xml version="1.0"?>
<reginfo xmlns="urn:ietf:params:xml:ns:reginfo" version="21" state="full">
<registration aor="sip:user2@example.com" id="0x7f9b6bc55540" state="terminated"/>
<registration aor="sip:user2@example.com" id="0x7f46836f63b8" state="active">
<contact id="0x7f46836f64e0" state="active" event="refreshed" expires="300" callid="15796302815379-26687127665413@192.168.10.130" cseq="36" received="" path="<sip:172.23.42.1;lr;received=sip:uac.public.ip:5099;r2=on>,<sip:kamailio.public.ip;lr;received=sip:uac.public.ip:5099;r2=on>" user_agent="MyUA 1.2.3.4">
<uri>sip:user2@192.168.10.130:5099</uri>
</contact>
</registration>
</reginfo>
</code></pre></div>
<p dir="auto">What is maybe missing: if the aor and id are the same on different presentities (is possible ?) we should not put it twice in the same body, because aor+id identify an unique registration.</p>
<p dir="auto">Most of the code has been adapted from <code class="notranslate">presence_dialoginfo</code> so I have preserved the original authors, too.<br>
Since is a bit complex PR (for me, at least) I'm begging for a in deep review ;)</p>
<hr>
<h4>You can view, comment on, or merge this pull request online at:</h4>
<p> <a href='https://github.com/kamailio/kamailio/pull/3240'>https://github.com/kamailio/kamailio/pull/3240</a></p>
<h4>Commit Summary</h4>
<ul>
<li><a href="https://github.com/kamailio/kamailio/pull/3240/commits/e3631b31440fcdb58aa30853f1043be566bee694" class="commit-link">e3631b3</a> [presence_reginfo] Add option for aggregating presentities</li>
</ul>
<h4 style="display: inline-block">File Changes </h4> <p style="display: inline-block">(<a href="https://github.com/kamailio/kamailio/pull/3240/files">6 files</a>)</p>
<ul>
<li>
<strong>M</strong>
<a href="https://github.com/kamailio/kamailio/pull/3240/files#diff-b92ba300554e64dfe0156b7144081794d9c8bc74113810b6c2b542565537964c">src/modules/presence_reginfo/Makefile</a>
(19)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/kamailio/kamailio/pull/3240/files#diff-3cba3e5f83b4af2f10e1e9c83671af27f928c90429cd1ded1b42fe0d7f8494a6">src/modules/presence_reginfo/add_events.c</a>
(17)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/kamailio/kamailio/pull/3240/files#diff-d052a46938e80f44bccc2c656da92290143e1785447fe0e48c220a73a20a631f">src/modules/presence_reginfo/doc/presence_reginfo_admin.xml</a>
(21)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/kamailio/kamailio/pull/3240/files#diff-8e130a741ba0de0d6e90e2cbd4a8ca33d63ebfb601929646fe4c4bb74e383b7b">src/modules/presence_reginfo/notify_body.c</a>
(322)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/kamailio/kamailio/pull/3240/files#diff-973bf533f7567b2e702a94d379110f1bdf9a1e74a01737612b4bbad10906b012">src/modules/presence_reginfo/notify_body.h</a>
(43)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/kamailio/kamailio/pull/3240/files#diff-28fa2911972a06391ffc26ed9b7f844d53dc10889cfd691305d2a7ecba171396">src/modules/presence_reginfo/presence_reginfo.c</a>
(8)
</li>
</ul>
<h4>Patch Links:</h4>
<ul>
<li><a href='https://github.com/kamailio/kamailio/pull/3240.patch'>https://github.com/kamailio/kamailio/pull/3240.patch</a></li>
<li><a href='https://github.com/kamailio/kamailio/pull/3240.diff'>https://github.com/kamailio/kamailio/pull/3240.diff</a></li>
</ul>
<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />Reply to this email directly, <a href="https://github.com/kamailio/kamailio/pull/3240">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/ABO7UZMJLYTLAVPKU2Q7S4TV6SFOHANCNFSM6AAAAAAQONRSIE">unsubscribe</a>.<br />You are receiving this because you are subscribed to this thread.<img src="https://github.com/notifications/beacon/ABO7UZPGKOHRMQENBA2WSDDV6SFOHA5CNFSM6AAAAAAQONRSIGWGG33NNVSW45C7OR4XAZNFJFZXG5LFVJRW63LNMVXHIX3JMTHFEBMDC4.gif" height="1" width="1" alt="" /><span style="color: transparent; font-size: 0; display: none; visibility: hidden; overflow: hidden; opacity: 0; width: 0; height: 0; max-width: 0; max-height: 0; mso-hide: all">Message ID: <span><kamailio/kamailio/pull/3240</span><span>@</span><span>github</span><span>.</span><span>com></span></span></p>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/kamailio/kamailio/pull/3240",
"url": "https://github.com/kamailio/kamailio/pull/3240",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>