From 4237d33ab8cca07bd3d79cd078a9db513b476bfd Mon Sep 17 00:00:00 2001 From: Anders Broman Date: Fri, 8 Mar 2013 16:53:14 +0000 Subject: [PATCH] Add new SIP headers. svn path=/trunk/; revision=48192 --- epan/dissectors/packet-sip.c | 621 +++++++++++++++++++---------------- 1 file changed, 343 insertions(+), 278 deletions(-) diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c index aa0b047855..a1f4a451ef 100644 --- a/epan/dissectors/packet-sip.c +++ b/epan/dissectors/packet-sip.c @@ -306,172 +306,190 @@ static const sip_header_t sip_headers[] = { #define POS_EVENT 23 { "Expires", NULL }, /* 24 */ #define POS_EXPIRES 24 - { "Flow-Timer", NULL }, /* 25 RFC5626 */ -#define POS_FLOW_TIMER 25 - { "From", "f" }, /* 26 */ -#define POS_FROM 26 + { "Feature-Caps", NULL }, /* 25 [RFC6809 */ +#define POS_FEATURE_CAPS 25 + { "Flow-Timer", NULL }, /* 26 RFC5626 */ +#define POS_FLOW_TIMER 26 + { "From", "f" }, /* 27 */ +#define POS_FROM 27 + + { "Geolocation", NULL }, /* 28 */ +#define POS_GEOLOCATION 28 + { "Geolocation-Error", NULL }, /* 29 */ +#define POS_GEOLOCATION_ERROR 29 + { "Geolocation-Routing", NULL }, /* 30 */ +#define POS_GEOLOCATION_ROUTING 30 + /* Hide [RFC3261] (deprecated)*/ - { "History-Info", NULL }, /* 27 RFC4244 */ -#define POS_HISTORY_INFO 27 - { "Identity", "y" }, /* 28 RFC4474 */ -#define POS_IDENTITY 28 - { "Identity-Info", "n" }, /* 29 RFC4474 */ -#define POS_IDENTITY_INFO 29 - { "Info-Package", NULL }, /* 30 RFC-ietf-sipcore-info-events-10.txt */ -#define POS_INFO_PKG 30 - { "In-Reply-To", NULL }, /* 31 RFC3261 */ -#define POS_IN_REPLY_TO 31 - { "Join", NULL }, /* 32 RFC3911 */ -#define POS_JOIN 32 - { "Max-Breadth", NULL }, /* 33 RFC5393*/ -#define POS_MAX_BREADTH 33 - { "Max-Forwards", NULL }, /* 34 */ -#define POS_MAX_FORWARDS 34 - { "MIME-Version", NULL }, /* 35 */ -#define POS_MIME_VERSION 35 - { "Min-Expires", NULL }, /* 36 */ -#define POS_MIN_EXPIRES 36 - { "Min-SE", NULL }, /* 37 RFC4028 */ -#define POS_MIN_SE 37 - { "Organization", NULL }, /* 38 RFC3261 */ -#define POS_ORGANIZATION 38 - { "P-Access-Network-Info", NULL }, /* 39 RFC3455 */ -#define POS_P_ACCESS_NETWORK_INFO 39 - { "P-Answer-State", NULL }, /* 40 RFC4964 */ -#define POS_P_ANSWER_STATE 40 - { "P-Asserted-Identity", NULL }, /* 41 RFC3325 */ -#define POS_P_ASSERTED_IDENTITY 41 - { "P-Asserted-Service", NULL }, /* 42 RFC-drage-sipping-service-identification-05.txt */ -#define POS_P_ASSERTED_SERV 42 - { "P-Associated-URI", NULL }, /* 43 RFC3455 */ -#define POS_P_ASSOCIATED_URI 43 - { "P-Called-Party-ID", NULL }, /* 44 RFC3455 */ -#define POS_P_CALLED_PARTY_ID 44 - { "P-Charging-Function-Addresses", NULL },/* 45 RFC3455 */ -#define POS_P_CHARGING_FUNC_ADDRESSES 45 - { "P-Charging-Vector", NULL }, /* 46 RFC3455 */ -#define POS_P_CHARGING_VECTOR 46 - { "P-DCS-Trace-Party-ID", NULL }, /* 47 RFC5503 */ -#define POS_P_DCS_TRACE_PARTY_ID 47 - { "P-DCS-OSPS", NULL }, /* 48 RFC5503 */ -#define POS_P_DCS_OSPS 48 - { "P-DCS-Billing-Info", NULL }, /* 49 RFC5503 */ -#define POS_P_DCS_BILLING_INFO 49 - { "P-DCS-LAES", NULL }, /* 50 RFC5503 */ -#define POS_P_DCS_LAES 50 - { "P-DCS-Redirect", NULL }, /* 51 RFC5503 */ -#define POS_P_DCS_REDIRECT 51 - { "P-Early-Media", NULL }, /* 52 RFC5009 */ -#define POS_P_EARLY_MEDIA 52 - { "P-Media-Authorization", NULL }, /* 53 RFC3313 */ -#define POS_P_MEDIA_AUTHORIZATION 53 - { "P-Preferred-Identity", NULL }, /* 54 RFC3325 */ -#define POS_P_PREFERRED_IDENTITY 54 - { "P-Preferred-Service", NULL }, /* 55 RFC-drage-sipping-service-identification-05.txt */ -#define POS_P_PREFERRED_SERV 55 - { "P-Profile-Key", NULL }, /* 56 RFC5002 */ -#define POS_P_PROFILE_KEY 56 - { "P-Refused-URI-List", NULL }, /* 57 RFC5318 */ -#define POS_P_REFUSED_URI_LST 57 - { "P-Served-User", NULL }, /* 58 RFC5502 */ -#define POS_P_SERVED_USER 58 - { "P-User-Database", NULL }, /* 59 RFC4457 */ -#define POS_P_USER_DATABASE 59 - { "P-Visited-Network-ID", NULL }, /* 60 RFC3455 */ -#define POS_P_VISITED_NETWORK_ID 60 - { "Path", NULL }, /* 61 RFC3327 */ -#define POS_PATH 61 - { "Permission-Missing", NULL }, /* 62 RFC5360 */ -#define POS_PERMISSION_MISSING 62 - { "Priority", NULL }, /* 63 RFC3261 */ -#define POS_PRIORITY 63 - { "Priv-Answer-Mode", NULL }, /* 64 RFC5373 */ -#define POS_PRIV_ANSWER_MODE 64 - { "Privacy", NULL }, /* 65 RFC3323 */ -#define POS_PRIVACY 65 - { "Proxy-Authenticate", NULL }, /* 66 */ -#define POS_PROXY_AUTHENTICATE 66 - { "Proxy-Authorization", NULL }, /* 67 */ -#define POS_PROXY_AUTHORIZATION 67 - { "Proxy-Require", NULL }, /* 68 */ -#define POS_PROXY_REQUIRE 68 - { "RAck", NULL }, /* 69 RFC3262 */ -#define POS_RACK 69 - { "Reason", NULL }, /* 70 RFC3326 */ -#define POS_REASON 70 - { "Record-Route", NULL }, /* 71 */ -#define POS_RECORD_ROUTE 71 - { "Recv-Info", NULL }, /* 72 RFC-ietf-sipcore-info-events-10.txt*/ -#define POS_RECV_INFO 72 - { "Refer-Sub", NULL }, /* 68 RFC4488 */ -#define POS_REFER_SUB 73 - { "Refer-To", "r" }, /* 69 RFC3515 */ -#define POS_REFER_TO 74 - { "Referred-By", "b" }, /* 70 RFC3892 */ -#define POS_REFERED_BY 75 - { "Reject-Contact", "j" }, /* 71 RFC3841 */ -#define POS_REJECT_CONTACT 76 - { "Replaces", NULL }, /* 72 RFC3891 */ -#define POS_REPLACES 77 - { "Reply-To", NULL }, /* 73 RFC3261 */ -#define POS_REPLY_TO 78 - { "Request-Disposition", "d" }, /* 74 RFC3841 */ -#define POS_REQUEST_DISPOSITION 79 - { "Require", NULL }, /* 75 RFC3261 */ -#define POS_REQUIRE 80 - { "Resource-Priority", NULL }, /* 76 RFC4412 */ -#define POS_RESOURCE_PRIORITY 81 + { "History-Info", NULL }, /* 31 RFC4244 */ +#define POS_HISTORY_INFO 31 + { "Identity", "y" }, /* 32 RFC4474 */ +#define POS_IDENTITY 32 + { "Identity-Info", "n" }, /* 33 RFC4474 */ +#define POS_IDENTITY_INFO 33 + { "Info-Package", NULL }, /* 34 RFC-ietf-sipcore-info-events-10.txt */ +#define POS_INFO_PKG 34 + { "In-Reply-To", NULL }, /* 35 RFC3261 */ +#define POS_IN_REPLY_TO 35 + { "Join", NULL }, /* 36 RFC3911 */ +#define POS_JOIN 36 + { "Max-Breadth", NULL }, /* 37 RFC5393*/ +#define POS_MAX_BREADTH 37 + { "Max-Forwards", NULL }, /* 38 */ +#define POS_MAX_FORWARDS 38 + { "MIME-Version", NULL }, /* 39 */ +#define POS_MIME_VERSION 39 + { "Min-Expires", NULL }, /* 40 */ +#define POS_MIN_EXPIRES 40 + { "Min-SE", NULL }, /* 41 RFC4028 */ +#define POS_MIN_SE 41 + { "Organization", NULL }, /* 42 RFC3261 */ +#define POS_ORGANIZATION 42 + { "P-Access-Network-Info", NULL }, /* 43 RFC3455 */ +#define POS_P_ACCESS_NETWORK_INFO 43 + { "P-Answer-State", NULL }, /* 44 RFC4964 */ +#define POS_P_ANSWER_STATE 44 + { "P-Asserted-Identity", NULL }, /* 45 RFC3325 */ +#define POS_P_ASSERTED_IDENTITY 45 + { "P-Asserted-Service", NULL }, /* 46 RFC6050 */ +#define POS_P_ASSERTED_SERV 46 + { "P-Associated-URI", NULL }, /* 47 RFC3455 */ +#define POS_P_ASSOCIATED_URI 47 + { "P-Called-Party-ID", NULL }, /* 48 RFC3455 */ +#define POS_P_CALLED_PARTY_ID 48 + { "P-Charging-Function-Addresses", NULL }, /* 49 RFC3455 */ +#define POS_P_CHARGING_FUNC_ADDRESSES 49 + { "P-Charging-Vector", NULL }, /* 50 RFC3455 */ +#define POS_P_CHARGING_VECTOR 50 + { "P-DCS-Trace-Party-ID", NULL }, /* 51 RFC5503 */ +#define POS_P_DCS_TRACE_PARTY_ID 51 + { "P-DCS-OSPS", NULL }, /* 52 RFC5503 */ +#define POS_P_DCS_OSPS 52 + { "P-DCS-Billing-Info", NULL }, /* 53 RFC5503 */ +#define POS_P_DCS_BILLING_INFO 53 + { "P-DCS-LAES", NULL }, /* 54 RFC5503 */ +#define POS_P_DCS_LAES 54 + { "P-DCS-Redirect", NULL }, /* 55 RFC5503 */ +#define POS_P_DCS_REDIRECT 55 + { "P-Early-Media", NULL }, /* 56 RFC5009 */ +#define POS_P_EARLY_MEDIA 56 + { "P-Media-Authorization", NULL }, /* 57 RFC3313 */ +#define POS_P_MEDIA_AUTHORIZATION 57 + { "P-Preferred-Identity", NULL }, /* 58 RFC3325 */ +#define POS_P_PREFERRED_IDENTITY 58 + { "P-Preferred-Service", NULL }, /* 58 RFC6050 */ +#define POS_P_PREFERRED_SERV 59 + { "P-Profile-Key", NULL }, /* 60 RFC5002 */ +#define POS_P_PROFILE_KEY 60 + { "P-Refused-URI-List", NULL }, /* 61 RFC5318 */ +#define POS_P_REFUSED_URI_LST 61 + { "P-Served-User", NULL }, /* 62 RFC5502 */ +#define POS_P_SERVED_USER 62 + { "P-User-Database", NULL }, /* 63 RFC4457 */ +#define POS_P_USER_DATABASE 63 + { "P-Visited-Network-ID", NULL }, /* 64 RFC3455 */ +#define POS_P_VISITED_NETWORK_ID 64 + { "Path", NULL }, /* 65 RFC3327 */ +#define POS_PATH 65 + { "Permission-Missing", NULL }, /* 66 RFC5360 */ +#define POS_PERMISSION_MISSING 66 + { "Policy-Contact", NULL }, /* 67 RFC3261 */ +#define POS_POLICY_CONTACT 67 + { "Policy-ID", NULL }, /* 68 RFC3261 */ +#define POS_POLICY_ID 68 + { "Priority", NULL }, /* 69 RFC3261 */ +#define POS_PRIORITY 69 + { "Priv-Answer-Mode", NULL }, /* 70 RFC5373 */ +#define POS_PRIV_ANSWER_MODE 70 + { "Privacy", NULL }, /* 71 RFC3323 */ +#define POS_PRIVACY 71 + { "Proxy-Authenticate", NULL }, /* 72 */ +#define POS_PROXY_AUTHENTICATE 72 + { "Proxy-Authorization", NULL }, /* 73 */ +#define POS_PROXY_AUTHORIZATION 73 + { "Proxy-Require", NULL }, /* 74 */ +#define POS_PROXY_REQUIRE 74 + { "RAck", NULL }, /* 75 RFC3262 */ +#define POS_RACK 75 + { "Reason", NULL }, /* 76 RFC3326 */ +#define POS_REASON 76 + { "Reason-Phrase", NULL }, /* 77 RFC3326 */ +#define POS_REASON_PHRASE 77 + { "Record-Route", NULL }, /* 78 */ +#define POS_RECORD_ROUTE 78 + { "Recv-Info", NULL }, /* 79 RFC-ietf-sipcore-info-events-10.txt*/ +#define POS_RECV_INFO 79 + { "Refer-Sub", NULL }, /* 80 RFC4488 */ +#define POS_REFER_SUB 80 + { "Refer-To", "r" }, /* 81 RFC3515 */ +#define POS_REFER_TO 81 + { "Referred-By", "b" }, /* 82 RFC3892 */ +#define POS_REFERED_BY 82 + { "Reject-Contact", "j" }, /* 83 RFC3841 */ +#define POS_REJECT_CONTACT 83 + { "Replaces", NULL }, /* 84 RFC3891 */ +#define POS_REPLACES 84 + { "Reply-To", NULL }, /* 85 RFC3261 */ +#define POS_REPLY_TO 85 + { "Request-Disposition", "d" }, /* 86 RFC3841 */ +#define POS_REQUEST_DISPOSITION 86 + { "Require", NULL }, /* 87 RFC3261 */ +#define POS_REQUIRE 87 + { "Resource-Priority", NULL }, /* 88 RFC4412 */ +#define POS_RESOURCE_PRIORITY 88 /*{ "Response-Key (Deprecated) [RFC3261]*/ - { "Retry-After", NULL }, /* 77 RFC3261 */ -#define POS_RETRY_AFTER 82 - { "Route", NULL }, /* 78 RFC3261 */ -#define POS_ROUTE 83 - { "RSeq", NULL }, /* 79 RFC3262 */ -#define POS_RSEQ 84 - { "Security-Client", NULL }, /* 80 RFC3329 */ -#define POS_SECURITY_CLIENT 85 - { "Security-Server", NULL }, /* 81 RFC3329 */ -#define POS_SECURITY_SERVER 86 - { "Security-Verify", NULL }, /* 82 RFC3329 */ -#define POS_SECURITY_VERIFY 87 - { "Server", NULL }, /* 83 RFC3261 */ -#define POS_SERVER 88 - { "Service-Route", NULL }, /* 84 RFC3608 */ -#define POS_SERVICE_ROUTE 89 - { "Session-Expires", "x" }, /* 85 RFC4028 */ -#define POS_SESSION_EXPIRES 90 - { "SIP-ETag", NULL }, /* 86 RFC3903 */ -#define POS_SIP_ETAG 91 - { "SIP-If-Match", NULL }, /* 87 RFC3903 */ -#define POS_SIP_IF_MATCH 92 - { "Subject", "s" }, /* 88 RFC3261 */ -#define POS_SUBJECT 93 - { "Subscription-State", NULL }, /* 89 RFC3265 */ -#define POS_SUBSCRIPTION_STATE 94 - { "Supported", "k" }, /* 90 RFC3261 */ -#define POS_SUPPORTED 95 - { "Target-Dialog", NULL }, /* 81 RFC4538 */ -#define POS_TARGET_DALOG 96 - { "Timestamp", NULL }, /* 92 RFC3261 */ -#define POS_TIMESTAMP 97 - { "To", "t" }, /* 93 RFC3261 */ -#define POS_TO 98 - { "Trigger-Consent", NULL }, /* 94 RFC5360 */ -#define POS_TRIGGER_CONSENT 99 - { "Unsupported", NULL }, /* 95 RFC3261 */ -#define POS_UNSUPPORTED 100 - { "User-Agent", NULL }, /* 96 RFC3261 */ -#define POS_USER_AGENT 101 - { "Via", "v" }, /* 97 RFC3261 */ -#define POS_VIA 102 - { "Warning", NULL }, /* 98 RFC3261 */ -#define POS_WARNING 103 - { "WWW-Authenticate", NULL }, /* 99 RFC3261 */ -#define POS_WWW_AUTHENTICATE 104 - { "Diversion", NULL }, /* 105 RFC5806 */ -#define POS_DIVERSION 105 + { "Retry-After", NULL }, /* 89 RFC3261 */ +#define POS_RETRY_AFTER 89 + { "Route", NULL }, /* 90 RFC3261 */ +#define POS_ROUTE 90 + { "RSeq", NULL }, /* 91 RFC3262 */ +#define POS_RSEQ 91 + { "Security-Client", NULL }, /* 92 RFC3329 */ +#define POS_SECURITY_CLIENT 92 + { "Security-Server", NULL }, /* 93 RFC3329 */ +#define POS_SECURITY_SERVER 93 + { "Security-Verify", NULL }, /* 94 RFC3329 */ +#define POS_SECURITY_VERIFY 94 + { "Server", NULL }, /* 95 RFC3261 */ +#define POS_SERVER 95 + { "Service-Route", NULL }, /* 96 RFC3608 */ +#define POS_SERVICE_ROUTE 96 + { "Session-Expires", "x" }, /* 97 RFC4028 */ +#define POS_SESSION_EXPIRES 97 + { "SIP-ETag", NULL }, /* 98 RFC3903 */ +#define POS_SIP_ETAG 98 + { "SIP-If-Match", NULL }, /* 99 RFC3903 */ +#define POS_SIP_IF_MATCH 99 + { "Subject", "s" }, /* 100 RFC3261 */ +#define POS_SUBJECT 100 + { "Subscription-State", NULL }, /* 101 RFC3265 */ +#define POS_SUBSCRIPTION_STATE 101 + { "Supported", "k" }, /* 102 RFC3261 */ +#define POS_SUPPORTED 102 + { "Suppress-If-Match", NULL }, /* 103 RFC5839 */ +#define POS_SUPPRESS_IF_MATCH 103 + { "Target-Dialog", NULL }, /* 104 RFC4538 */ +#define POS_TARGET_DIALOG 104 + { "Timestamp", NULL }, /* 105 RFC3261 */ +#define POS_TIMESTAMP 105 + { "To", "t" }, /* 106 RFC3261 */ +#define POS_TO 106 + { "Trigger-Consent", NULL }, /* 107 RFC5360 */ +#define POS_TRIGGER_CONSENT 107 + { "Unsupported", NULL }, /* 108 RFC3261 */ +#define POS_UNSUPPORTED 108 + { "User-Agent", NULL }, /* 109 RFC3261 */ +#define POS_USER_AGENT 109 + { "Via", "v" }, /* 110 RFC3261 */ +#define POS_VIA 110 + { "Warning", NULL }, /* 111 RFC3261 */ +#define POS_WARNING 111 + { "WWW-Authenticate", NULL }, /* 112 RFC3261 */ +#define POS_WWW_AUTHENTICATE 112 + { "Diversion", NULL }, /* 113 RFC5806 */ +#define POS_DIVERSION 113 { "User-to-User", NULL }, /* 106 draft-johnston-sipping-cc-uui-09 */ -#define POS_USER_TO_USER 106 +#define POS_USER_TO_USER 114 }; @@ -503,88 +521,96 @@ static gint hf_header_array[] = { -1, /* 22"Error-Info", */ -1, /* 23"Event", */ -1, /* 24"Expires", */ - -1, /* 25"From", */ + -1, /* 25"Feature-Caps", */ -1, /* 26"Flow-Timer", RFC5626 */ - -1, /* 27"History-Info", RFC4244 */ - -1, /* 28"Identity", */ - -1, /* 29"Identity-Info", RFC4474 */ - -1, /* 30"Info-Package", RFC-ietf-sipcore-info-events-10.txt */ - -1, /* 31"In-Reply-To", RFC3261 */ - -1, /* 32"Join", RFC3911 */ - -1, /* 33"Max-Breadth" RFC5393 */ - -1, /* 34"Max-Forwards", */ - -1, /* 35"MIME-Version", */ - -1, /* 36"Min-Expires", */ - -1, /* 37"Min-SE", RFC4028 */ - -1, /* 38"Organization", */ - -1, /* 39"P-Access-Network-Info", RFC3455 */ - -1, /* 40"P-Answer-State", RFC4964 */ - -1, /* 41"P-Asserted-Identity", RFC3325 */ - -1, /* 42"P-Asserted-Service", RFC-drage-sipping-service-identification-05.txt */ - -1, /* 43"P-Associated-URI", RFC3455 */ - -1, /* 44"P-Called-Party-ID", RFC3455 */ - -1, /* 45"P-Charging-Function-Addresses", RFC3455 */ - -1, /* 46"P-Charging-Vector", RFC3455 */ - -1, /* 47"P-DCS-Trace-Party-ID", RFC3603 */ - -1, /* 48"P-DCS-OSPS", RFC3603 */ - -1, /* 49"P-DCS-Billing-Info", RFC3603 */ - -1, /* 50"P-DCS-LAES", RFC3603 */ - -1, /* 51"P-DCS-Redirect", RFC3603 */ - -1, /* 52"P-Early-Media", */ - -1, /* 53"P-Media-Authorization", RFC3313 */ - -1, /* 54"P-Preferred-Identity", RFC3325 */ - -1, /* 55"P-Preferred-Service", RFC-drage-sipping-service-identification-05.txt */ - -1, /* 56"P-Profile-Key", */ - -1, /* 57"P-Refused-URI-List", RFC5318 */ - -1, /* 58"P-Served-User", RFC5502 */ - -1, /* 59"P-User-Database RFC4457 */ - -1, /* 60"P-Visited-Network-ID", RFC3455 */ - -1, /* 61"Path", RFC3327 */ - -1, /* 62"Permission-Missing" RFC5360 */ - -1, /* 63"Priority" */ - -1, /* 64"Priv-Answer-mode" RFC5373 */ - -1, /* 65"Privacy", RFC3323 */ - -1, /* 66"Proxy-Authenticate", */ - -1, /* 67"Proxy-Authorization", */ - -1, /* 68"Proxy-Require", */ - -1, /* 69"RAck", RFC3262 */ - -1, /* 70"Reason", RFC3326 */ - -1, /* 71"Record-Route", */ - -1, /* 72"Recv-Info", RFC-ietf-sipcore-info-events-10.txt */ - -1, /* 73"Refer-Sub",", RFC4488 */ - -1, /* 74"Refer-To", RFC3515 */ - -1, /* 75"Referred-By", */ - -1, /* 76"Reject-Contact", RFC3841 */ - -1, /* 77"Replaces", RFC3891 */ - -1, /* 78"Reply-To", RFC3261 */ - -1, /* 79"Request-Disposition", RFC3841 */ - -1, /* 80"Require", RFC3261 */ - -1, /* 81"Resource-Priority", RFC4412 */ - -1, /* 82"Retry-After", RFC3261 */ - -1, /* 83"Route", RFC3261 */ - -1, /* 84"RSeq", RFC3262 */ - -1, /* 85"Security-Client", RFC3329 */ - -1, /* 86"Security-Server", RFC3329 */ - -1, /* 87"Security-Verify", RFC3329 */ - -1, /* 88"Server", RFC3261 */ - -1, /* 89"Service-Route", RFC3608 */ - -1, /* 90"Session-Expires", RFC4028 */ - -1, /* 91"SIP-ETag", RFC3903 */ - -1, /* 92"SIP-If-Match", RFC3903 */ - -1, /* 93"Subject", RFC3261 */ - -1, /* 94"Subscription-State", RFC3265 */ - -1, /* 95"Supported", RFC3261 */ - -1, /* 96"Target-Dialog", RFC4538 */ - -1, /* 97"Timestamp", RFC3261 */ - -1, /* 98"To", RFC3261 */ - -1, /* 99"Trigger-Consent" RFC5380 */ - -1, /* 100"Unsupported", RFC3261 */ - -1, /* 101"User-Agent", RFC3261 */ - -1, /* 102"Via", RFC3261 */ - -1, /* 103"Warning", RFC3261 */ - -1, /* 104"WWW-Authenticate", RFC3261 */ - -1, /* 105"Diversion", RFC5806 */ - -1, /* 106"User-to-User", draft-johnston-sipping-cc-uui-09 */ + -1, /* 27"From", */ + -1, /* 28"Geolocation", */ + -1, /* 29"Geolocation-Error", */ + -1, /* 30"Geolocation-Routing", */ + -1, /* 31"History-Info", RFC4244 */ + -1, /* 32"Identity", */ + -1, /* 33"Identity-Info", RFC4474 */ + -1, /* 34"Info-Package", RFC-ietf-sipcore-info-events-10.txt */ + -1, /* 35"In-Reply-To", RFC3261 */ + -1, /* 36"Join", RFC3911 */ + -1, /* 37"Max-Breadth" RFC5393 */ + -1, /* 38"Max-Forwards", */ + -1, /* 39"MIME-Version", */ + -1, /* 40"Min-Expires", */ + -1, /* 41"Min-SE", RFC4028 */ + -1, /* 42"Organization", */ + -1, /* 43"P-Access-Network-Info", RFC3455 */ + -1, /* 44"P-Answer-State", RFC4964 */ + -1, /* 45"P-Asserted-Identity", RFC3325 */ + -1, /* 46"P-Asserted-Service", RFC-drage-sipping-service-identification-05.txt */ + -1, /* 47"P-Associated-URI", RFC3455 */ + -1, /* 48"P-Called-Party-ID", RFC3455 */ + -1, /* 49"P-Charging-Function-Addresses", RFC3455 */ + -1, /* 50"P-Charging-Vector", RFC3455 */ + -1, /* 51"P-DCS-Trace-Party-ID", RFC3603 */ + -1, /* 52"P-DCS-OSPS", RFC3603 */ + -1, /* 53"P-DCS-Billing-Info", RFC3603 */ + -1, /* 54"P-DCS-LAES", RFC3603 */ + -1, /* 55"P-DCS-Redirect", RFC3603 */ + -1, /* 56"P-Early-Media", */ + -1, /* 57"P-Media-Authorization", RFC3313 */ + -1, /* 58"P-Preferred-Identity", RFC3325 */ + -1, /* 59"P-Preferred-Service", RFC-drage-sipping-service-identification-05.txt */ + -1, /* 60"P-Profile-Key", */ + -1, /* 61"P-Refused-URI-List", RFC5318 */ + -1, /* 62"P-Served-User", RFC5502 */ + -1, /* 63"P-User-Database RFC4457 */ + -1, /* 64"P-Visited-Network-ID", RFC3455 */ + -1, /* 65"Path", RFC3327 */ + -1, /* 66"Permission-Missing" RFC5360 */ + -1, /* 67"Policy-Contact" RFC5360 */ + -1, /* 68"Policy-ID" RFC5360 */ + -1, /* 69"Priority" */ + -1, /* 70"Priv-Answer-mode" RFC5373 */ + -1, /* 71"Privacy", RFC3323 */ + -1, /* 72"Proxy-Authenticate", */ + -1, /* 73"Proxy-Authorization", */ + -1, /* 74"Proxy-Require", */ + -1, /* 75"RAck", RFC3262 */ + -1, /* 76"Reason", RFC3326 */ + -1, /* 77"Reason-Phrase", RFC3326 */ + -1, /* 78"Record-Route", */ + -1, /* 79"Recv-Info", RFC-ietf-sipcore-info-events-10.txt */ + -1, /* 80"Refer-Sub",", RFC4488 */ + -1, /* 81"Refer-To", RFC3515 */ + -1, /* 82"Referred-By", */ + -1, /* 83"Reject-Contact", RFC3841 */ + -1, /* 84"Replaces", RFC3891 */ + -1, /* 85"Reply-To", RFC3261 */ + -1, /* 86"Request-Disposition", RFC3841 */ + -1, /* 87"Require", RFC3261 */ + -1, /* 88"Resource-Priority", RFC4412 */ + -1, /* 89"Retry-After", RFC3261 */ + -1, /* 90"Route", RFC3261 */ + -1, /* 91"RSeq", RFC3262 */ + -1, /* 92"Security-Client", RFC3329 */ + -1, /* 93"Security-Server", RFC3329 */ + -1, /* 94"Security-Verify", RFC3329 */ + -1, /* 95"Server", RFC3261 */ + -1, /* 96"Service-Route", RFC3608 */ + -1, /* 97"Session-Expires", RFC4028 */ + -1, /* 98"SIP-ETag", RFC3903 */ + -1, /* 99"SIP-If-Match", RFC3903 */ + -1, /* 100"Subject", RFC3261 */ + -1, /* 101"Subscription-State", RFC3265 */ + -1, /* 102"Supported", RFC3261 */ + -1, /* 103"Suppress-If-Match", RFC4538 */ + -1, /* 104"Target-Dialog", RFC4538 */ + -1, /* 105"Timestamp", RFC3261 */ + -1, /* 106"To", RFC3261 */ + -1, /* 107"Trigger-Consent" RFC5380 */ + -1, /* 108"Unsupported", RFC3261 */ + -1, /* 109"User-Agent", RFC3261 */ + -1, /* 110"Via", RFC3261 */ + -1, /* 111"Warning", RFC3261 */ + -1, /* 112"WWW-Authenticate", RFC3261 */ + -1, /* 113"Diversion", RFC5806 */ + -1, /* 114"User-to-User", draft-johnston-sipping-cc-uui-09 */ }; @@ -4395,6 +4421,11 @@ void proto_register_sip(void) FT_UINT32, BASE_DEC,NULL,0x0, "RFC 3261: Expires Header", HFILL } }, + { &hf_header_array[POS_FEATURE_CAPS], + { "Feature-Caps", "sip.feature_caps", + FT_UINT32, BASE_DEC,NULL,0x0, + NULL, HFILL } + }, { &hf_header_array[POS_FLOW_TIMER], { "Flow-Timer", "sip.Flow-Timer", FT_STRING, BASE_NONE,NULL,0x0, @@ -4405,12 +4436,47 @@ void proto_register_sip(void) FT_STRING, BASE_NONE,NULL,0x0, "RFC 3261: From Header", HFILL } }, - { &hf_header_array[POS_IN_REPLY_TO], + { &hf_header_array[POS_GEOLOCATION], + { "Geolocation", "sip.Geolocation", + FT_STRING, BASE_NONE,NULL,0x0, + NULL, HFILL } + }, + { &hf_header_array[POS_GEOLOCATION_ERROR], + { "Geolocation-Error", "sip.Geolocation", + FT_STRING, BASE_NONE,NULL,0x0, + NULL, HFILL } + }, + { &hf_header_array[POS_GEOLOCATION_ROUTING], + { "Geolocation-Routing", "sip.Geolocation_Routing", + FT_STRING, BASE_NONE,NULL,0x0, + NULL, HFILL } + }, + { &hf_header_array[POS_HISTORY_INFO], + { "History-Info", "sip.History-Info", + FT_STRING, BASE_NONE,NULL,0x0, + "RFC 4244: Request History Information", HFILL } + }, + { &hf_header_array[POS_IDENTITY], + { "Identity", "sip.Identity", + FT_STRING, BASE_NONE,NULL,0x0, + "RFC 4474: Request Identity", HFILL } + }, + { &hf_header_array[POS_IDENTITY_INFO], + { "Identity-info", "sip.Identity-info", + FT_STRING, BASE_NONE,NULL,0x0, + "RFC 4474: Request Identity-info", HFILL } + }, + { &hf_header_array[POS_INFO_PKG], + { "Info-Package", "sip.Info-Package", + FT_STRING, BASE_NONE,NULL,0x0, + NULL, HFILL } + }, + { &hf_header_array[POS_IN_REPLY_TO], { "In-Reply-To", "sip.In-Reply-To", FT_STRING, BASE_NONE,NULL,0x0, "RFC 3261: In-Reply-To Header", HFILL } }, - { &hf_header_array[POS_JOIN], + { &hf_header_array[POS_JOIN], { "Join", "sip.Join", FT_STRING, BASE_NONE,NULL,0x0, "Draft: Join Header", HFILL } @@ -4420,22 +4486,22 @@ void proto_register_sip(void) FT_UINT32, BASE_DEC,NULL,0x0, "RFC 5393: Max-Breadth Header", HFILL } }, - { &hf_header_array[POS_MAX_FORWARDS], + { &hf_header_array[POS_MAX_FORWARDS], { "Max-Forwards", "sip.Max-Forwards", FT_UINT32, BASE_DEC,NULL,0x0, "RFC 3261: Max-Forwards Header", HFILL } }, - { &hf_header_array[POS_MIME_VERSION], + { &hf_header_array[POS_MIME_VERSION], { "MIME-Version", "sip.MIME-Version", FT_STRING, BASE_NONE,NULL,0x0, "RFC 3261: MIME-Version Header", HFILL } }, - { &hf_header_array[POS_MIN_EXPIRES], + { &hf_header_array[POS_MIN_EXPIRES], { "Min-Expires", "sip.Min-Expires", FT_STRING, BASE_NONE,NULL,0x0, "RFC 3261: Min-Expires Header", HFILL } }, - { &hf_header_array[POS_MIN_SE], + { &hf_header_array[POS_MIN_SE], { "Min-SE", "sip.Min-SE", FT_STRING, BASE_NONE,NULL,0x0, "Draft: Min-SE Header", HFILL } @@ -4579,7 +4645,16 @@ void proto_register_sip(void) FT_STRING, BASE_NONE,NULL,0x0, "RFC 5360: Permission Missing Header", HFILL } }, - + { &hf_header_array[POS_POLICY_CONTACT], + { "Policy-Contact", "sip.Policy_Contact", + FT_STRING, BASE_NONE,NULL,0x0, + NULL, HFILL } + }, + { &hf_header_array[POS_POLICY_ID], + { "Policy-ID", "sip.Policy_ID", + FT_STRING, BASE_NONE,NULL,0x0, + NULL, HFILL } + }, { &hf_header_array[POS_PRIORITY], { "Priority", "sip.Priority", FT_STRING, BASE_NONE,NULL,0x0, @@ -4601,7 +4676,7 @@ void proto_register_sip(void) FT_STRING, BASE_NONE,NULL,0x0, "RFC 3261: Proxy-Authenticate Header", HFILL } }, - { &hf_header_array[POS_PROXY_AUTHORIZATION], + { &hf_header_array[POS_PROXY_AUTHORIZATION], { "Proxy-Authorization", "sip.Proxy-Authorization", FT_STRING, BASE_NONE,NULL,0x0, "RFC 3261: Proxy-Authorization Header", HFILL } @@ -4622,6 +4697,11 @@ void proto_register_sip(void) FT_STRING, BASE_NONE,NULL,0x0, "RFC 3326 Reason Header", HFILL } }, + { &hf_header_array[POS_REASON_PHRASE], + { "Reason-Phrase", "sip.Reason-Phrase", + FT_STRING, BASE_NONE,NULL,0x0, + NULL, HFILL } + }, { &hf_header_array[POS_RECORD_ROUTE], { "Record-Route", "sip.Record-Route", FT_STRING, BASE_NONE,NULL,0x0, @@ -4637,6 +4717,11 @@ void proto_register_sip(void) FT_STRING, BASE_NONE,NULL,0x0, "RFC 4488: Refer-Sub Header", HFILL } }, + { &hf_header_array[POS_REFER_TO], + { "Refer-To", "sip.Refer-To", + FT_STRING, BASE_NONE,NULL,0x0, + "RFC 3515: Refer-To Header", HFILL } + }, { &hf_header_array[POS_REFERED_BY], { "Refered By", "sip.Refered-by", FT_STRING, BASE_NONE,NULL,0x0, @@ -4742,7 +4827,12 @@ void proto_register_sip(void) FT_STRING, BASE_NONE,NULL,0x0, "RFC 3261: Supported Header", HFILL } }, - { &hf_header_array[POS_TARGET_DALOG], + { &hf_header_array[POS_SUPPRESS_IF_MATCH], + { "Suppress-If-Match", "sip.Suppress_If_Match", + FT_STRING, BASE_NONE,NULL,0x0, + NULL, HFILL } + }, + { &hf_header_array[POS_TARGET_DIALOG], { "Target-Dialog", "sip.Target-Dialog", FT_STRING, BASE_NONE,NULL,0x0, "RFC 4538: Target-Dialog Header", HFILL } @@ -4790,31 +4880,6 @@ void proto_register_sip(void) FT_STRING, BASE_NONE,NULL,0x0, "RFC 3261: WWW-Authenticate Header", HFILL } }, - { &hf_header_array[POS_REFER_TO], - { "Refer-To", "sip.Refer-To", - FT_STRING, BASE_NONE,NULL,0x0, - "RFC 3515: Refer-To Header", HFILL } - }, - { &hf_header_array[POS_HISTORY_INFO], - { "History-Info", "sip.History-Info", - FT_STRING, BASE_NONE,NULL,0x0, - "RFC 4244: Request History Information", HFILL } - }, - { &hf_header_array[POS_IDENTITY], - { "Identity", "sip.Identity", - FT_STRING, BASE_NONE,NULL,0x0, - "RFC 4474: Request Identity", HFILL } - }, - { &hf_header_array[POS_IDENTITY_INFO], - { "Identity-info", "sip.Identity-info", - FT_STRING, BASE_NONE,NULL,0x0, - "RFC 4474: Request Identity-info", HFILL } - }, - { &hf_header_array[POS_INFO_PKG], - { "Info-Package", "sip.Info-Package", - FT_STRING, BASE_NONE,NULL,0x0, - NULL, HFILL } - }, { &hf_header_array[POS_DIVERSION], { "Diversion", "sip.Diversion", FT_STRING, BASE_NONE,NULL,0x0,