Browse code

More log message fixes.

Jan Janak authored on 30/03/2004 16:20:04
Showing 11 changed files
... ...
@@ -153,10 +153,10 @@ static int inline write_to_fifo(char *fifo, int cnt )
153 153
 	if((fd_fifo = open(fifo,O_WRONLY | O_NONBLOCK)) == -1){
154 154
 		switch(errno){
155 155
 			case ENXIO:
156
-				LOG(L_ERR,"ERROR:tm:t_write_req: nobody listening on "
156
+				LOG(L_ERR,"ERROR:tm:write_to_fifo: nobody listening on "
157 157
 					" [%s] fifo for reading!\n",fifo);
158 158
 			default:
159
-				LOG(L_ERR,"ERROR:tm:t_write_req: failed to open [%s] "
159
+				LOG(L_ERR,"ERROR:tm:write_to_fifo: failed to open [%s] "
160 160
 					"fifo : %s\n", fifo, strerror(errno));
161 161
 		}
162 162
 		goto error;
... ...
@@ -166,7 +166,7 @@ static int inline write_to_fifo(char *fifo, int cnt )
166 166
 repeat:
167 167
 	if (writev(fd_fifo, (struct iovec*)lines_eol, 2*cnt)<0) {
168 168
 		if (errno!=EINTR) {
169
-			LOG(L_ERR, "ERROR:tm:t_write_req: writev failed: %s\n",
169
+			LOG(L_ERR, "ERROR:tm:write_to_fifo: writev failed: %s\n",
170 170
 				strerror(errno));
171 171
 			close(fd_fifo);
172 172
 			goto error;
... ...
@@ -176,7 +176,7 @@ repeat:
176 176
 	}
177 177
 	close(fd_fifo);
178 178
 
179
-	DBG("DEBUG:tm:t_write_req: write completed\n");
179
+	DBG("DEBUG:tm:write_to_fifo: write completed\n");
180 180
 	return 1; /* OK */
181 181
 
182 182
 error:
... ...
@@ -88,7 +88,7 @@ inline int insert_tmcb(struct tmcb_head_list *cb_list, int types,
88 88
 
89 89
 	/* build a new callback structure */
90 90
 	if (!(cbp=shm_malloc( sizeof( struct tm_callback)))) {
91
-		LOG(L_ERR, "ERROR:tm:register_tmcb: out of shm. mem\n");
91
+		LOG(L_ERR, "ERROR:tm:insert_tmcb: out of shm. mem\n");
92 92
 		return E_OUT_OF_MEM;
93 93
 	}
94 94
 
... ...
@@ -163,11 +163,11 @@ void init_t() {global_msg_id=0; set_t(T_UNDEFINED);}
163 163
 static inline int parse_dlg( struct sip_msg *msg )
164 164
 {
165 165
 	if (parse_headers(msg, HDR_FROM | HDR_CSEQ | HDR_TO, 0)==-1) {
166
-		LOG(L_ERR, "ERROR: tid_matching: From or Cseq or To invalid\n");
166
+		LOG(L_ERR, "ERROR: parse_dlg: From or Cseq or To invalid\n");
167 167
 		return 0;
168 168
 	}
169 169
 	if (parse_from_header(msg)==-1) {
170
-		LOG(L_ERR, "ERROR: tid_matching: From broken\n");
170
+		LOG(L_ERR, "ERROR: parse_dlg: From broken\n");
171 171
 		return 0;
172 172
 	}
173 173
 	/* To is automatically parsed through HDR_TO in parse bitmap,
... ...
@@ -308,7 +308,7 @@ static int matching_3261( struct sip_msg *p_msg, struct cell **trans,
308 308
 			if (!dlg_parsed) {
309 309
 				dlg_parsed=1;
310 310
 				if (!parse_dlg(p_msg)) {
311
-					LOG(L_ERR, "ERROR: tid_matching: dlg parsing failed\n");
311
+					LOG(L_ERR, "ERROR: matching_3261: dlg parsing failed\n");
312 312
 					return 0;
313 313
 				}
314 314
 			}
... ...
@@ -536,7 +536,7 @@ struct cell* t_lookupOriginalT(  struct sip_msg* p_msg )
536 536
 	 * comparison of many header fields
537 537
 	 */
538 538
 	if (!p_msg->via1) {
539
-		LOG(L_ERR, "ERROR: t_lookup_request: no via\n");
539
+		LOG(L_ERR, "ERROR: t_lookupOriginalT: no via\n");
540 540
 		set_t(0);
541 541
 		return 0;
542 542
 	}
... ...
@@ -1007,7 +1007,7 @@ int t_newtran( struct sip_msg* p_msg )
1007 1007
 
1008 1008
 
1009 1009
 	/* is T still up-to-date ? */
1010
-	DBG("DEBUG: t_addifnew: msg id=%d , global msg id=%d ,"
1010
+	DBG("DEBUG: t_newtran: msg id=%d , global msg id=%d ,"
1011 1011
 		" T on entrance=%p\n",p_msg->id,global_msg_id,T);
1012 1012
 
1013 1013
 	if ( T && T!=T_UNDEFINED  ) {
... ...
@@ -113,7 +113,7 @@ char *build_local(struct cell *Trans,unsigned int branch,
113 113
 		&branch_str, 0, Trans->uac[branch].request.dst.proto, &hp );
114 114
 	if (!via)
115 115
 	{
116
-		LOG(L_ERR, "ERROR: t_build_and_send_CANCEL: "
116
+		LOG(L_ERR, "ERROR: build_local: "
117 117
 			"no via header got from builder\n");
118 118
 		goto error;
119 119
 	}
... ...
@@ -140,7 +140,7 @@ char *build_local(struct cell *Trans,unsigned int branch,
140 140
 	cancel_buf=shm_malloc( *len+1 );
141 141
 	if (!cancel_buf)
142 142
 	{
143
-		LOG(L_ERR, "ERROR: t_build_and_send_CANCEL: cannot allocate memory\n");
143
+		LOG(L_ERR, "ERROR: build_local: cannot allocate memory\n");
144 144
 		goto error01;
145 145
 	}
146 146
 	p = cancel_buf;
... ...
@@ -548,7 +548,7 @@ static inline int assemble_via(str* dest, struct cell* t, struct socket_info* so
548 548
 	struct hostport hp;
549 549
 
550 550
 	if (!t_calc_branch(t, branch, branch_buf, &len)) {
551
-		LOG(L_ERR, "ERROR: build_via: branch calculation failed\n");
551
+		LOG(L_ERR, "ERROR: assemble_via: branch calculation failed\n");
552 552
 		return -1;
553 553
 	}
554 554
 	
... ...
@@ -562,7 +562,7 @@ static inline int assemble_via(str* dest, struct cell* t, struct socket_info* so
562 562
 	set_hostport(&hp, 0);
563 563
 	via = via_builder(&via_len, sock, &branch_str, 0, sock->proto, &hp);
564 564
 	if (!via) {
565
-		LOG(L_ERR, "build_via: via building failed\n");
565
+		LOG(L_ERR, "assemble_via: via building failed\n");
566 566
 		return -2;
567 567
 	}
568 568
 	
... ...
@@ -175,7 +175,7 @@ int unmatched_totag(struct cell *t, struct sip_msg *ack)
175 175
 
176 176
 	if (parse_headers(ack, HDR_TO,0)==-1 || 
177 177
 				!ack->to ) {
178
-		LOG(L_ERR, "ERROR: ack_totag_set: To invalid\n");
178
+		LOG(L_ERR, "ERROR: unmatched_totag: To invalid\n");
179 179
 		return 1;
180 180
 	}
181 181
 	tag=&get_to(ack)->tag_value;
... ...
@@ -268,7 +268,7 @@ static char *build_ack(struct sip_msg* rpl,struct cell *trans,int branch,
268 268
 	str to;
269 269
 
270 270
     if (parse_headers(rpl,HDR_TO, 0)==-1 || !rpl->to ) {
271
-        LOG(L_ERR, "ERROR: t_build_ACK: "
271
+        LOG(L_ERR, "ERROR: build_ack: "
272 272
             "cannot generate a HBH ACK if key HFs in reply missing\n");
273 273
         return NULL;
274 274
     }
... ...
@@ -334,7 +334,7 @@ static int _reply_light( struct cell *trans, char* buf, unsigned int len,
334 334
 
335 335
 	if (!buf)
336 336
 	{
337
-		DBG("DEBUG: t_reply: response building failed\n");
337
+		DBG("DEBUG: _reply_light: response building failed\n");
338 338
 		/* determine if there are some branches to be cancelled */
339 339
 		if ( is_invite(trans) ) {
340 340
 			if (lock) LOCK_REPLIES( trans );
... ...
@@ -349,7 +349,7 @@ static int _reply_light( struct cell *trans, char* buf, unsigned int len,
349 349
 	if (lock) LOCK_REPLIES( trans );
350 350
 	if ( is_invite(trans) ) which_cancel(trans, &cancel_bitmap );
351 351
 	if (trans->uas.status>=200) {
352
-		LOG( L_ERR, "ERROR: t_reply: can't generate %d reply"
352
+		LOG( L_ERR, "ERROR: _reply_light: can't generate %d reply"
353 353
 			" when a final %d was sent out\n", code, trans->uas.status);
354 354
 		goto error2;
355 355
 	}
... ...
@@ -363,7 +363,7 @@ static int _reply_light( struct cell *trans, char* buf, unsigned int len,
363 363
 	rb->buffer = (char*)shm_resize( rb->buffer, buf_len );
364 364
 	/* puts the reply's buffer to uas.response */
365 365
 	if (! rb->buffer ) {
366
-			LOG(L_ERR, "ERROR: t_reply: cannot allocate shmem buffer\n");
366
+			LOG(L_ERR, "ERROR: _reply_light: cannot allocate shmem buffer\n");
367 367
 			goto error3;
368 368
 	}
369 369
 	update_local_tags(trans, bm, rb->buffer, buf);
... ...
@@ -402,14 +402,14 @@ static int _reply_light( struct cell *trans, char* buf, unsigned int len,
402 402
 	   not yet, don't try to retransmit
403 403
 	*/
404 404
 	if (!trans->uas.response.dst.send_sock) {
405
-		LOG(L_ERR, "ERROR: _reply: no resolved dst to send reply to\n");
405
+		LOG(L_ERR, "ERROR: _reply_light: no resolved dst to send reply to\n");
406 406
 	} else {
407 407
 		SEND_PR_BUFFER( rb, buf, len );
408 408
 		DBG("DEBUG: reply sent out. buf=%p: %.9s..., shmem=%p: %.9s\n", 
409 409
 			buf, buf, rb->buffer, rb->buffer );
410 410
 	}
411 411
 	pkg_free( buf ) ;
412
-	DBG("DEBUG: t_reply: finished\n");
412
+	DBG("DEBUG: _reply_light: finished\n");
413 413
 	return 1;
414 414
 
415 415
 error3:
... ...
@@ -536,7 +536,7 @@ static inline int fake_req(struct sip_msg *faked_req,
536 536
 	if (shmem_msg->body_lumps) {
537 537
 		faked_req->body_lumps=dup_lump_list(shmem_msg->body_lumps);
538 538
 		if (!faked_req->body_lumps) { /* non_empty->empty ... failure */
539
-			LOG(L_ERR, "ERROR: on_negative_handlers: lump dup failed\n");
539
+			LOG(L_ERR, "ERROR: fake_req: lump dup failed\n");
540 540
 			goto error02;
541 541
 		}
542 542
 	}
... ...
@@ -707,7 +707,7 @@ static enum rps t_should_relay_response( struct cell *Trans , int new_code,
707 707
 	/* if final response sent out, allow only INVITE 2xx  */
708 708
 	if ( Trans->uas.status >= 200 ) {
709 709
 		if (inv_through) {
710
-			DBG("DBG: t_should_relay: 200 INV after final sent\n");
710
+			DBG("DBG: t_should_relay_response: 200 INV after final sent\n");
711 711
 			*should_store=0;
712 712
 			Trans->uac[branch].last_received=new_code;
713 713
 			*should_relay=branch;
... ...
@@ -734,7 +734,7 @@ static enum rps t_should_relay_response( struct cell *Trans , int new_code,
734 734
 		}
735 735
 		/* this looks however how a very strange status rewrite attempt;
736 736
 		 * report on it */
737
-		LOG(L_ERR, "ERROR: t_should_relay: status rewrite by UAS: "
737
+		LOG(L_ERR, "ERROR: t_should_relay_response: status rewrite by UAS: "
738 738
 			"stored: %d, received: %d\n",
739 739
 			Trans->uac[branch].last_received, new_code );
740 740
 		goto discard;
... ...
@@ -923,7 +923,7 @@ void cleanup_uac_timers( struct cell *t )
923 923
 		reset_timer( &t->uac[i].request.retr_timer );
924 924
 		reset_timer( &t->uac[i].request.fr_timer );
925 925
 	}
926
-	DBG("DEBUG: cleanup_uacs: RETR/FR timers reset\n");
926
+	DBG("DEBUG: cleanup_uac_timers: RETR/FR timers reset\n");
927 927
 }
928 928
 
929 929
 static int store_reply( struct cell *trans, int branch, struct sip_msg *rpl)
... ...
@@ -1220,7 +1220,7 @@ int reply_received( struct sip_msg  *p_msg )
1220 1220
 	msg_status=p_msg->REPLY_STATUS;
1221 1221
 
1222 1222
 	uac=&t->uac[branch];
1223
-	DBG("DEBUG: t_on_reply: org. status uas=%d, "
1223
+	DBG("DEBUG: reply_received: org. status uas=%d, "
1224 1224
 		"uac[%d]=%d local=%d is_invite=%d)\n",
1225 1225
 		t->uas.status, branch, uac->last_received, 
1226 1226
 		is_local(t), is_invite(t));
... ...
@@ -162,7 +162,7 @@ int init_tm_stats(void)
162 162
 
163 163
 	tm_stats=shm_malloc(sizeof(struct t_stats));
164 164
 	if (tm_stats==0) {
165
-		LOG(L_ERR, "ERROR: init_stats: no mem for stats\n");
165
+		LOG(L_ERR, "ERROR: init_tm_stats: no mem for stats\n");
166 166
 		goto error0;
167 167
 	}
168 168
 	memset(tm_stats, 0, sizeof(struct t_stats) );
... ...
@@ -170,21 +170,21 @@ int init_tm_stats(void)
170 170
 	size=sizeof(stat_counter)*process_count();
171 171
 	tm_stats->s_waiting=shm_malloc(size);
172 172
 	if (tm_stats->s_waiting==0) {
173
-		LOG(L_ERR, "ERROR: init_stats: no mem for stats\n");
173
+		LOG(L_ERR, "ERROR: init_tm_stats: no mem for stats\n");
174 174
 		goto error1;
175 175
 	}
176 176
 	memset(tm_stats->s_waiting, 0, size );
177 177
 
178 178
 	tm_stats->s_transactions=shm_malloc(size);
179 179
 	if (tm_stats->s_transactions==0) {
180
-		LOG(L_ERR, "ERROR: init_stats: no mem for stats\n");
180
+		LOG(L_ERR, "ERROR: init_tm_stats: no mem for stats\n");
181 181
 		goto error2;
182 182
 	}
183 183
 	memset(tm_stats->s_transactions, 0, size );
184 184
 
185 185
 	tm_stats->s_client_transactions=shm_malloc(size);
186 186
 	if (tm_stats->s_client_transactions==0) {
187
-		LOG(L_ERR, "ERROR: init_stats: no mem for stats\n");
187
+		LOG(L_ERR, "ERROR: init_tm_stats: no mem for stats\n");
188 188
 		goto error3;
189 189
 	}
190 190
 	memset(tm_stats->s_client_transactions, 0, size );
... ...
@@ -350,7 +350,7 @@ inline static void final_response_handler( struct timer_link *fr_tl )
350 350
 	/* FR for local cancels.... */
351 351
 	if (r_buf->activ_type==TYPE_LOCAL_CANCEL)
352 352
 	{
353
-		DBG("DEBUG: FR_handler: stop retr for Local Cancel\n");
353
+		DBG("DEBUG: final_response_handler: stop retr for Local Cancel\n");
354 354
 		return;
355 355
 	}
356 356
 
... ...
@@ -359,7 +359,7 @@ inline static void final_response_handler( struct timer_link *fr_tl )
359 359
 #		ifdef EXTRA_DEBUG
360 360
 		if (t->uas.request->REQ_METHOD!=METHOD_INVITE
361 361
 			|| t->uas.status < 200 ) {
362
-			LOG(L_ERR, "ERROR: FR timer: uknown type reply buffer\n");
362
+			LOG(L_ERR, "ERROR: final_response_handler: uknown type reply buffer\n");
363 363
 			abort();
364 364
 		}
365 365
 #		endif
... ...
@@ -393,12 +393,12 @@ inline static void final_response_handler( struct timer_link *fr_tl )
393 393
 		&& has_noisy_ctimer(t);
394 394
 	if (silent) {
395 395
 		UNLOCK_REPLIES(t);
396
-		DBG("DEBUG: FR_handler: transaction silently dropped (%p)\n",t);
396
+		DBG("DEBUG: final_response_handler: transaction silently dropped (%p)\n",t);
397 397
 		put_on_wait( t );
398 398
 		return;
399 399
 	}
400 400
 
401
-	DBG("DEBUG: FR_handler:stop retr. and send CANCEL (%p)\n", t);
401
+	DBG("DEBUG: final_response_handler:stop retr. and send CANCEL (%p)\n", t);
402 402
 	fake_reply(t, r_buf->branch, 408 );
403 403
 
404 404
 	DBG("DEBUG: final_response_handler : done\n");
... ...
@@ -497,7 +497,7 @@ void unlink_timer_lists()
497 497
 	/* unlink the timer lists */
498 498
 	for( i=0; i<NR_OF_TIMER_LISTS ; i++ )
499 499
 		reset_timer_list( i );
500
-	DBG("DEBUG: tm_shutdown : empting DELETE list\n");
500
+	DBG("DEBUG: unlink_timer_lists : empting DELETE list\n");
501 501
 	/* deletes all cells from DELETE_LIST list 
502 502
 	   (they are no more accessible from enrys) */
503 503
 	while (tl!=end) {
... ...
@@ -642,7 +642,7 @@ static void add_timer_unsafe( struct timer *timer_list, struct timer_link *tl,
642 642
 		abort();
643 643
 	}
644 644
 #endif
645
-	DBG("DEBUG: add_to_tail_of_timer[%d]: %p\n",timer_list->id,tl);
645
+	DBG("DEBUG: add_timer_unsafe[%d]: %p\n",timer_list->id,tl);
646 646
 }
647 647
 
648 648
 
... ...
@@ -632,7 +632,7 @@ inline static int _w_t_forward_nonack(struct sip_msg* msg, char* proxy,
632 632
 		}
633 633
 		return t_forward_nonack(t, msg, ( struct proxy_l *) proxy, proto );
634 634
 	} else {
635
-		DBG("DEBUG: t_forward_nonack: no transaction found\n");
635
+		DBG("DEBUG: forward_nonack: no transaction found\n");
636 636
 		return -1;
637 637
 	}
638 638
 }
... ...
@@ -773,7 +773,7 @@ inline static int _w_t_relay_to( struct sip_msg  *p_msg ,
773 773
 			return -1;
774 774
 		}
775 775
 		if (t_forward_nonack(t, p_msg, proxy, PROTO_NONE)<=0 ) {
776
-			LOG(L_ERR, "ERROR: failure_route: t_relay_to failed\n");
776
+			LOG(L_ERR, "ERROR: w_t_relay_to: t_relay_to failed\n");
777 777
 			return -1;
778 778
 		}
779 779
 		return 1;
... ...
@@ -91,7 +91,7 @@ int uac_init(void)
91 91
 	 * on no matter the protocol */
92 92
 	si=bind_address?bind_address:get_first_socket();
93 93
 	if (si==0){
94
-		LOG(L_CRIT, "BUG: child_init_callid: null socket list\n");
94
+		LOG(L_CRIT, "BUG: uac_init: null socket list\n");
95 95
 		return -1;
96 96
 	}
97 97
 
... ...
@@ -320,7 +320,7 @@ int request(str* m, str* ruri, str* to, str* from, str* h, str* b, transaction_c
320 320
 	generate_fromtag(&fromtag, &callid);
321 321
 
322 322
 	if (new_dlg_uac(&callid, &fromtag, DEFAULT_CSEQ, from, to, &dialog) < 0) {
323
-		LOG(L_ERR, "req_outside(): Error while creating temorary dialog\n");
323
+		LOG(L_ERR, "request(): Error while creating temorary dialog\n");
324 324
 		goto err;
325 325
 	}
326 326
 
... ...
@@ -77,8 +77,8 @@ struct str_list {
77 77
  */
78 78
 static inline void fifo_uac_error(char *reply_fifo, int code, char *msg)
79 79
 {
80
-	LOG(L_ERR, "ERROR: fifo_uac: %s\n", msg ); 
81
-	fifo_reply(reply_fifo, "%d fifo_uac: %s", code, msg);
80
+	LOG(L_ERR, "ERROR: fifo_uac_error: %s\n", msg ); 
81
+	fifo_reply(reply_fifo, "%d fifo_uac_error: %s", code, msg);
82 82
 }
83 83
 
84 84
 
... ...
@@ -214,7 +214,7 @@ static inline struct str_list *new_str(char *s, int len, struct str_list **last,
214 214
 	struct str_list *new;
215 215
 	new=pkg_malloc(sizeof(struct str_list));
216 216
 	if (!new) {
217
-		LOG(L_ERR, "ERROR: get_hfblock: not enough mem\n");
217
+		LOG(L_ERR, "ERROR: new_str: not enough mem\n");
218 218
 		return 0;
219 219
 	}
220 220
 	new->s.s=s;
... ...
@@ -269,7 +269,7 @@ static char *get_hfblock(str *uri, struct hdr_field *hf, int *l, int proto)
269 269
 						if (!sock_name) {
270 270
 							send_sock=uri2sock( uri, &to_su, proto );
271 271
 							if (!send_sock) {
272
-								LOG(L_ERR, "ERROR: get_hf_block: send_sock failed\n");
272
+								LOG(L_ERR, "ERROR: get_hfblock: send_sock failed\n");
273 273
 								goto error;
274 274
 							}
275 275
 							sock_name=&send_sock->address_str;
... ...
@@ -297,14 +297,14 @@ static char *get_hfblock(str *uri, struct hdr_field *hf, int *l, int proto)
297 297
 		/* proceed to next header */
298 298
 		/* new=new_str(CRLF, CRLF_LEN, &last, &total_len );
299 299
 		if (!new) goto error; */
300
-		DBG("DEBUG: get_hf_block: one more hf processed\n");
300
+		DBG("DEBUG: get_hfblock: one more hf processed\n");
301 301
 	} /* header loop */
302 302
 
303 303
 
304 304
 	/* construct a single header block now */
305 305
 	ret=pkg_malloc(total_len);
306 306
 	if (!ret) {
307
-		LOG(L_ERR, "ERROR: get_hf_block no pkg mem for hf block\n");
307
+		LOG(L_ERR, "ERROR: get_hfblock no pkg mem for hf block\n");
308 308
 		goto error;
309 309
 	}
310 310
 	i=sl.next;
... ...
@@ -498,13 +498,13 @@ static inline int print_uris(FILE* out, struct sip_msg* reply)
498 498
 	
499 499
 	dlg = (dlg_t*)shm_malloc(sizeof(dlg_t));
500 500
 	if (!dlg) {
501
-		LOG(L_ERR, "print_routes(): No memory left\n");
501
+		LOG(L_ERR, "print_uris(): No memory left\n");
502 502
 		return -1;
503 503
 	}
504 504
 
505 505
 	memset(dlg, 0, sizeof(dlg_t));
506 506
 	if (dlg_response_uac(dlg, reply) < 0) {
507
-		LOG(L_ERR, "print_routes(): Error while creating dialog structure\n");
507
+		LOG(L_ERR, "print_uris(): Error while creating dialog structure\n");
508 508
 		free_dlg(dlg);
509 509
 		return -2;
510 510
 	}
... ...
@@ -155,7 +155,7 @@ static int get_body_lines(str* body, str* msg)
155 155
 		unixsock_reply_send();
156 156
 		return -1;
157 157
 	}
158
-	DBG("get_body: %.*s\n", body->len,  ZSW(body->s));
158
+	DBG("get_body_lines: %.*s\n", body->len,  ZSW(body->s));
159 159
 	return 0;
160 160
 }
161 161
 
... ...
@@ -296,7 +296,7 @@ static char *get_hfblock(str *uri, struct hdr_field *hf, int *l, int proto)
296 296
 					if (!sock_name) {
297 297
 						send_sock = uri2sock(uri, &to_su, proto);
298 298
 						if (!send_sock) {
299
-							LOG(L_ERR, "ERROR: get_hf_block: send_sock failed\n");
299
+							LOG(L_ERR, "ERROR: get_hfblock: send_sock failed\n");
300 300
 							goto error;
301 301
 						}
302 302
 						sock_name = &send_sock->address_str;
... ...
@@ -317,13 +317,13 @@ static char *get_hfblock(str *uri, struct hdr_field *hf, int *l, int proto)
317 317
 				}
318 318
 			} /* possible substitute */
319 319
 		} /* substitution loop */
320
-		DBG("get_hf_block: one more hf processed\n");
320
+		DBG("get_hfblock: one more hf processed\n");
321 321
 	} /* header loop */
322 322
 	
323 323
 	     /* construct a single header block now */
324 324
 	ret = pkg_malloc(total_len);
325 325
 	if (!ret) {
326
-		LOG(L_ERR, "get_hf_block: no pkg mem for hf block\n");
326
+		LOG(L_ERR, "get_hfblock: no pkg mem for hf block\n");
327 327
 		goto error;
328 328
 	}
329 329
 	i = sl.next;