starter: Reject connections having both 'ah' and 'esp' keywords set

We currently don't support mixed proposals or bundles, so don't create the
illusion we would.

diff --git a/src/starter/args.c b/src/starter/args.c
index 42deb86390e5037235e138a1eb320b5a9be03d0e..f5a617eaa806b04f5db504006957c17ab8c2406e 100644 (file)
--- a/src/starter/args.c
+++ b/src/starter/args.c
@@ -295,6 +295,15 @@ bool assign_arg(kw_token_t token, kw_token_t first, kw_list_t *kw, char *base,
                return FALSE;
        }
 
+       if (token == KW_ESP || token == KW_AH)
+       {
+               if (*seen & (SEEN_KW(KW_ESP, first) | SEEN_KW(KW_AH, first)))
+               {
+                       DBG1(DBG_APP, "# can't have both 'ah' and 'esp' options");
+                       return FALSE;
+               }
+       }
+
        /* set flag that this argument has been seen */
        *seen |= SEEN_KW(token, first);