|
@@ -220,7 +220,6 @@ int msrp_parse_headers(msrp_frame_t *mf)
|
|
|
char *s; /* start for search */
|
|
|
msrp_hdr_t *hdr;
|
|
|
msrp_hdr_t *last;
|
|
|
-
|
|
|
int fpath = 0; /* From path set */
|
|
|
int tpath = 0; /* To path set */
|
|
|
int any = 0; /* Any header set */
|
|
@@ -296,23 +295,23 @@ int msrp_parse_headers(msrp_frame_t *mf)
|
|
|
msrp_hdr_set_type(hdr);
|
|
|
|
|
|
if (hdr->htype == MSRP_HDR_TO_PATH) {
|
|
|
- tpath = 1;
|
|
|
- if (fpath || any) {
|
|
|
- LM_ERR("broken msrp frame message, To-Path must be the first header.\n");
|
|
|
- return -1;
|
|
|
- }
|
|
|
+ tpath = 1;
|
|
|
+ if (fpath || any) {
|
|
|
+ LM_ERR("broken msrp frame message, To-Path must be the first header.\n");
|
|
|
+ return -1;
|
|
|
+ }
|
|
|
} else if (hdr->htype == MSRP_HDR_FROM_PATH) {
|
|
|
- fpath = 1;
|
|
|
- if (!tpath || any) {
|
|
|
- LM_ERR("broken msrp frame message, From-Path must be the second header.\n");
|
|
|
- return -1;
|
|
|
- }
|
|
|
+ fpath = 1;
|
|
|
+ if (!tpath || any) {
|
|
|
+ LM_ERR("broken msrp frame message, From-Path must be the second header.\n");
|
|
|
+ return -1;
|
|
|
+ }
|
|
|
} else {
|
|
|
- any = 1;
|
|
|
- if (!tpath || !fpath) {
|
|
|
- LM_ERR("broken msrp frame message, To-Path and From-Path must be defined before any header.\n");
|
|
|
- return -1;
|
|
|
- }
|
|
|
+ any = 1;
|
|
|
+ if (!tpath || !fpath) {
|
|
|
+ LM_ERR("broken msrp frame message, To-Path and From-Path must be defined before any header.\n");
|
|
|
+ return -1;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
LM_DBG("MSRP Header: (%p) [%.*s] [%d] [%.*s]\n",
|
|
@@ -322,8 +321,8 @@ int msrp_parse_headers(msrp_frame_t *mf)
|
|
|
}
|
|
|
|
|
|
if (!tpath || !fpath) {
|
|
|
- LM_ERR("broken msrp frame message, To-Path and From-Path must be defined.\n");
|
|
|
- return -1;
|
|
|
+ LM_ERR("broken msrp frame message, To-Path and From-Path must be defined.\n");
|
|
|
+ return -1;
|
|
|
}
|
|
|
|
|
|
ateoh:
|