Changeset 1559:2dbc816d48f4 in freeDiameter for libfdproto

Timestamp:

Oct 27, 2020, 6:50:04 PM (3 years ago)

Author:

Thomas Klausner <wiz@gatalith.at>

Branch:

default

Phase:

public

Message:

Fail when a peer with empty Origin-Realm tries to connect.

Empty Origin-Realms cause problems in the routing code later.

Reduce warnings when reporting an empty Failed-AVP;
both avp_source and avp_rawdata are NULL in this case.

File:

• libfdproto/messages.c (modified) (2 diffs)

libfdproto/messages.c

@@ -1777 +1777 @@
         if (avp->avp_model == NULL) {
                 /* In the case where we don't know the type of AVP, just copy the raw data or source */
-                CHECK_PARAMS( avp->avp_source || avp->avp_rawdata );
+                /* there might be no data if the AVP is empty */
                 
                 if ( avp->avp_rawdata != NULL ) {
@@ -1783 +1783 @@
                         memcpy(&buffer[*offset], avp->avp_rawdata, avp->avp_rawlen);
                         *offset += PAD4(avp->avp_rawlen);
-                } else {
+                } else if ( avp->avp_source != NULL ) {
                         /* the message was not parsed completely */
                         size_t datalen = avp->avp_public.avp_len - GETAVPHDRSZ(avp->avp_public.avp_flags);