2
0
Эх сурвалжийг харах

core: events - rename SREV_NET_DATA_SEND to SREV_NET_DATA_SENT

- reflects better the purpose, being executed after the message is sent

(cherry picked from commit 93df5a5241f57ffb71dad0b0df04a256b7b0b7b4)
Daniel-Constantin Mierla 4 жил өмнө
parent
commit
e2c7d171bb

+ 8 - 8
src/core/events.c

@@ -175,9 +175,9 @@ int sr_event_register_cb(int type, sr_event_cb_f f)
 					_sr_events_list.net_data_recv = f;
 				else return -1;
 			break;
-		case SREV_NET_DATA_SEND:
-				if(_sr_events_list.net_data_send==0)
-					_sr_events_list.net_data_send = f;
+		case SREV_NET_DATA_SENT:
+				if(_sr_events_list.net_data_sent==0)
+					_sr_events_list.net_data_sent = f;
 				else return -1;
 			break;
 		case SREV_SIP_REPLY_OUT:
@@ -320,10 +320,10 @@ int sr_event_exec(int type, sr_event_param_t *evp)
 					ret = _sr_events_list.net_data_recv(evp);
 					return ret;
 				} else return 1;
-		case SREV_NET_DATA_SEND:
-				if(unlikely(_sr_events_list.net_data_send!=0))
+		case SREV_NET_DATA_SENT:
+				if(unlikely(_sr_events_list.net_data_sent!=0))
 				{
-					ret = _sr_events_list.net_data_send(evp);
+					ret = _sr_events_list.net_data_sent(evp);
 					return ret;
 				} else return 1;
 		case SREV_SIP_REPLY_OUT:
@@ -375,8 +375,8 @@ int sr_event_enabled(int type)
 				return (_sr_events_list.tcp_closed!=0)?1:0;
 		case SREV_NET_DATA_RECV:
 				return (_sr_events_list.net_data_recv!=0)?1:0;
-		case SREV_NET_DATA_SEND:
-				return (_sr_events_list.net_data_send!=0)?1:0;
+		case SREV_NET_DATA_SENT:
+				return (_sr_events_list.net_data_sent!=0)?1:0;
 		case SREV_SIP_REPLY_OUT:
 				return (_sr_events_list.sip_reply_out[0]!=0)?1:0;
 	}

+ 2 - 2
src/core/events.h

@@ -36,7 +36,7 @@
 #define SREV_STUN_IN			12
 #define SREV_TCP_CLOSED			13
 #define SREV_NET_DATA_RECV		14
-#define SREV_NET_DATA_SEND		15
+#define SREV_NET_DATA_SENT		15
 #define SREV_SIP_REPLY_OUT		16
 
 #define SREV_CB_LIST_SIZE	8
@@ -69,7 +69,7 @@ typedef struct sr_event_cb {
 	sr_event_cb_f rcv_nosip;
 	sr_event_cb_f tcp_closed;
 	sr_event_cb_f net_data_recv;
-	sr_event_cb_f net_data_send;
+	sr_event_cb_f net_data_sent;
 	sr_event_cb_f sip_reply_out[SREV_CB_LIST_SIZE];
 } sr_event_cb_t;
 

+ 1 - 1
src/core/forward.h

@@ -331,7 +331,7 @@ done:
 		netinfo.data.len = outb.len;
 		netinfo.dst = dst;
 		evp.data = (void*)&netinfo;
-		sr_event_exec(SREV_NET_DATA_SEND, &evp);
+		sr_event_exec(SREV_NET_DATA_SENT, &evp);
 	}
 
 	if(outb.s != buf)