fix: support repeatable extension headers

fonoster · Apr 7, 2024 · b70faf3 · b70faf3
1 parent 74834f5
commit b70faf3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/mods/edgeport/src/main/java/io/routr/headers/ExtensionConverter.java b/mods/edgeport/src/main/java/io/routr/headers/ExtensionConverter.java
@@ -26,7 +26,7 @@
 import javax.sip.header.HeaderFactory;
 import java.text.ParseException;
 
-@ProtoMapping(header = ExtensionHeader.class, field = "extensions", repeatable = false, extension = true)
+@ProtoMapping(header = ExtensionHeader.class, field = "extensions", repeatable = true, extension = true)
 public class ExtensionConverter implements Converter<Header, io.routr.message.Extension> {
   @Override
   public io.routr.message.Extension fromHeader(Header header) {

diff --git a/mods/edgeport/src/main/java/io/routr/headers/MessageConverter.java b/mods/edgeport/src/main/java/io/routr/headers/MessageConverter.java
@@ -87,8 +87,15 @@ public static SIPMessage convertToMessageDTO(final Message message) {
       ProtoMapping mapping = converter.getClass().getAnnotation(ProtoMapping.class);
       FieldDescriptor descriptor = SIPMessage.getDescriptor().findFieldByName(fieldName);
 
-      // Takes care of headers that might appear more than once
-      if (mapping.repeatable()) {
+      // Takes care of headers that might appear more than once and are custom
+      if (mapping.repeatable() && mapping.extension()) {
+        ListIterator<Header> headers = (ListIterator<Header>) message.getHeaders(header.getName());
+        while (headers.hasNext()) {
+          Header currentHeader = headers.next();
+          FieldDescriptor extDescriptor = SIPMessage.getDescriptor().findFieldByName(mapping.field());
+          sipMessageBuilder.addRepeatedField(extDescriptor, converter.fromHeader(currentHeader));
+        }
+      } else if (mapping.repeatable()) {
         ListIterator<Header> headers = (ListIterator<Header>) message.getHeaders(header.getName());
         while (headers.hasNext()) {
           Header currentHeader = headers.next();