From 77e7ca68bc93749109518335d39a65246a11ed0e Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Fri, 2 Mar 2012 13:46:11 +0000 Subject: [PATCH] add numbered comments to pcre --- daemon/control_udp.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/daemon/control_udp.c b/daemon/control_udp.c index f2bd429d8..28a0a5e6f 100644 --- a/daemon/control_udp.c +++ b/daemon/control_udp.c @@ -199,12 +199,11 @@ struct control_udp *control_udp_new(struct poller *p, struct in6_addr ip, u_int1 c->stale_chunks = g_string_chunk_new(4 * 1024); c->oven_time = p->now; c->parse_re = pcre_compile( - /* cookie:1 cmd:2 flags:3 callid:4 viabranch:5 addr4:6 addr6:7 port:8 from_tag:9 num:10 to_tag:11 d:12 flags:13 callid:14 viabranch:15 v:16 flags:17 parms:18 */ - "^(\\S+)\\s+(?:([ul])(\\S*)\\s+([^;]+)(?:;(\\S+))?\\s+" \ - "(?:([\\d.]+)|([\\da-f:]+(?::ffff:[\\d.]+)?))" \ - "\\s+(\\d+)\\s+(\\S+?);(\\d+)(?:\\s+(\\S+?);\\d+(?:\\s+.*)?)?\r?\n?$" \ - "|(d)(\\S*)\\s+([^;\\s]+)(?:;(\\S+))?\\s+" \ - "|(v)(\\S*)(?:\\s+(\\S+))?)", + "^(\\S+)\\s+(?:([ul])(\\S*)\\s+([^;]+)(?:;(\\S+))?\\s+" \ /* cookie cmd flags callid viabranch:5 */ + "(?:([\\d.]+)|([\\da-f:]+(?::ffff:[\\d.]+)?))" \ /* addr4 addr6:7 */ + "\\s+(\\d+)\\s+(\\S+?);(\\d+)(?:\\s+(\\S+?);\\d+(?:\\s+.*)?)?\r?\n?$" \ /* port fromtag num totag:11 */ + "|(d)(\\S*)\\s+([^;\\s]+)(?:;(\\S+))?\\s+" \ /* "d" flags callid viabranch:15 */ + "|(v)(\\S*)(?:\\s+(\\S+))?)", /* v flags params:18 */ PCRE_DOLLAR_ENDONLY | PCRE_DOTALL | PCRE_CASELESS, &errptr, &erroff, NULL); c->parse_ree = pcre_study(c->parse_re, 0, &errptr); /* cookie cmd flags callid addr port */