... | ... |
@@ -632,7 +632,9 @@ ifeq ($(OS), solaris) |
632 | 632 |
#LDFLAGS=-g $(PROFILE) |
633 | 633 |
#MOD_LDFLAGS=-g -G |
634 | 634 |
endif |
635 |
- |
|
635 |
+ifneq ($(TLS),) |
|
636 |
+ DEFS+= -I/usr/local/ssl/include |
|
637 |
+endif |
|
636 | 638 |
YACC=yacc |
637 | 639 |
|
638 | 640 |
ifeq ($(CC_NAME), suncc) |
... | ... |
@@ -688,7 +690,7 @@ endif |
688 | 690 |
|
689 | 691 |
#add libssl if needed |
690 | 692 |
ifneq ($(TLS),) |
691 |
-LIBS+= -lssl |
|
693 |
+LIBS+= -L/usr/local/lib -L/usr/local/ssl/lib -lssl -lcrypto |
|
692 | 694 |
endif |
693 | 695 |
|
694 | 696 |
ifneq ($(found_lock_method), yes) |
... | ... |
@@ -1175,7 +1175,7 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg, |
1175 | 1175 |
goto error01; /* free everything */ |
1176 | 1176 |
} |
1177 | 1177 |
DBG("build_req_from_req: id added: <%.*s>, rcv proto=%d\n", |
1178 |
- id_len, id_buf, msg->rcv.proto); |
|
1178 |
+ (int)id_len, id_buf, msg->rcv.proto); |
|
1179 | 1179 |
extra_params.s=id_buf; |
1180 | 1180 |
extra_params.len=id_len; |
1181 | 1181 |
} |
... | ... |
@@ -1185,8 +1185,8 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg, |
1185 | 1185 |
|| proto==PROTO_TLS |
1186 | 1186 |
#endif |
1187 | 1187 |
){ |
1188 |
- DBG("build_req_from_req: checking for clen; proto=%d, rcv->proto=%d\n", |
|
1189 |
- proto, msg->rcv.proto); |
|
1188 |
+ DBG("build_req_from_req: checking for clen; proto=%d," |
|
1189 |
+ " rcv->proto=%d\n", proto, msg->rcv.proto); |
|
1190 | 1190 |
/* first of all parse content-length */ |
1191 | 1191 |
if (parse_headers(msg, HDR_CONTENTLENGTH, 0)==-1){ |
1192 | 1192 |
LOG(L_ERR, "build_req_buf_from_sip_req:" |
... | ... |
@@ -678,7 +678,7 @@ static inline void handle_new_connect(struct socket_info* si, |
678 | 678 |
/* got a connection on r */ |
679 | 679 |
su_len=sizeof(su); |
680 | 680 |
new_sock=accept(si->socket, &(su.s), &su_len); |
681 |
- *n--; |
|
681 |
+ (*n)--; |
|
682 | 682 |
if (new_sock<0){ |
683 | 683 |
LOG(L_ERR, "WARNING: tcp_main_loop: error while accepting" |
684 | 684 |
" connection(%d): %s\n", errno, strerror(errno)); |