|
@@ -334,7 +334,7 @@ int append_branch(struct sip_msg* msg, str* uri, str* dst_uri, str* path,
|
|
|
* of branches, don't try new ones
|
|
|
*/
|
|
|
if (unlikely(nr_branches == MAX_BRANCHES - 1)) {
|
|
|
- LOG(L_ERR, "max nr of branches exceeded\n");
|
|
|
+ LM_ERR("max nr of branches exceeded\n");
|
|
|
ser_error = E_TOO_MANY_BRANCHES;
|
|
|
return -1;
|
|
|
}
|
|
@@ -350,14 +350,14 @@ int append_branch(struct sip_msg* msg, str* uri, str* dst_uri, str* path,
|
|
|
}
|
|
|
|
|
|
if (unlikely(luri.len > MAX_URI_SIZE - 1)) {
|
|
|
- LOG(L_ERR, "too long uri: %.*s\n", luri.len, luri.s);
|
|
|
+ LM_ERR("too long uri: %.*s\n", luri.len, luri.s);
|
|
|
return -1;
|
|
|
}
|
|
|
|
|
|
/* copy the dst_uri */
|
|
|
if (dst_uri && dst_uri->len && dst_uri->s) {
|
|
|
if (unlikely(dst_uri->len > MAX_URI_SIZE - 1)) {
|
|
|
- LOG(L_ERR, "too long dst_uri: %.*s\n", dst_uri->len, dst_uri->s);
|
|
|
+ LM_ERR("too long dst_uri: %.*s\n", dst_uri->len, dst_uri->s);
|
|
|
return -1;
|
|
|
}
|
|
|
memcpy(branches[nr_branches].dst_uri, dst_uri->s, dst_uri->len);
|
|
@@ -371,7 +371,7 @@ int append_branch(struct sip_msg* msg, str* uri, str* dst_uri, str* path,
|
|
|
/* copy the path string */
|
|
|
if (unlikely(path && path->len && path->s)) {
|
|
|
if (unlikely(path->len > MAX_PATH_SIZE - 1)) {
|
|
|
- LOG(L_ERR, "too long path: %.*s\n", path->len, path->s);
|
|
|
+ LM_ERR("too long path: %.*s\n", path->len, path->s);
|
|
|
return -1;
|
|
|
}
|
|
|
memcpy(branches[nr_branches].path, path->s, path->len);
|
|
@@ -394,7 +394,7 @@ int append_branch(struct sip_msg* msg, str* uri, str* dst_uri, str* path,
|
|
|
/* copy instance string */
|
|
|
if (unlikely(instance && instance->len && instance->s)) {
|
|
|
if (unlikely(instance->len > MAX_INSTANCE_SIZE - 1)) {
|
|
|
- LOG(L_ERR, "too long instance: %.*s\n",
|
|
|
+ LM_ERR("too long instance: %.*s\n",
|
|
|
instance->len, instance->s);
|
|
|
return -1;
|
|
|
}
|
|
@@ -413,7 +413,7 @@ int append_branch(struct sip_msg* msg, str* uri, str* dst_uri, str* path,
|
|
|
/* copy ruid string */
|
|
|
if (unlikely(ruid && ruid->len && ruid->s)) {
|
|
|
if (unlikely(ruid->len > MAX_RUID_SIZE - 1)) {
|
|
|
- LOG(L_ERR, "too long ruid: %.*s\n",
|
|
|
+ LM_ERR("too long ruid: %.*s\n",
|
|
|
ruid->len, ruid->s);
|
|
|
return -1;
|
|
|
}
|
|
@@ -428,7 +428,7 @@ int append_branch(struct sip_msg* msg, str* uri, str* dst_uri, str* path,
|
|
|
|
|
|
if (unlikely(location_ua && location_ua->len && location_ua->s)) {
|
|
|
if (unlikely(location_ua->len > MAX_UA_SIZE)) {
|
|
|
- LOG(L_ERR, "too long location_ua: %.*s\n",
|
|
|
+ LM_ERR("too long location_ua: %.*s\n",
|
|
|
location_ua->len, location_ua->s);
|
|
|
return -1;
|
|
|
}
|
|
@@ -492,7 +492,7 @@ char* print_dset(struct sip_msg* msg, int* len)
|
|
|
*len += CONTACT_LEN + CRLF_LEN + (cnt - 1) * CONTACT_DELIM_LEN;
|
|
|
|
|
|
if (*len + 1 > MAX_REDIRECTION_LEN) {
|
|
|
- LOG(L_ERR, "ERROR: redirection buffer length exceed\n");
|
|
|
+ LM_ERR("redirection buffer length exceed\n");
|
|
|
goto error;
|
|
|
}
|
|
|
|