From b88f26e50365e4ec58503f079bcd7f6216fea534 Mon Sep 17 00:00:00 2001
From: Matteo Cypriani <matteo.cypriani@univ-fcomte.fr>
Date: Fri, 11 Mar 2011 11:32:17 +0100
Subject: [PATCH] [lib] Rename create_udp_sending_socket()

Rename owl_create_udp_sending_socket() -> owl_create_udp_trx_socket().
---
 .../libowlps-client/libowlps-client.c                |  4 ++--
 .../owlps-aggregator/owlps-aggregatord.c             | 12 ++++++------
 libowlps/libowlps.c                                  |  8 ++++----
 libowlps/owlps.h                                     |  8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/infrastructure-centred/libowlps-client/libowlps-client.c b/infrastructure-centred/libowlps-client/libowlps-client.c
index b248930..ab17abf 100644
--- a/infrastructure-centred/libowlps-client/libowlps-client.c
+++ b/infrastructure-centred/libowlps-client/libowlps-client.c
@@ -18,8 +18,8 @@ int owlclient_create_trx_socket(char *dest_ip, uint_fast16_t dest_port,
 {
   struct sockaddr_in client ;
 
-  int sockfd = owl_create_udp_sending_socket(dest_ip, dest_port,
-                                             server, &client) ;
+  int sockfd = owl_create_udp_trx_socket(dest_ip, dest_port,
+                                         server, &client) ;
   if (sockfd < 0)
     {
       perror("Error! Cannot create UDP sending socket to the aggregation"
diff --git a/infrastructure-centred/owlps-aggregator/owlps-aggregatord.c b/infrastructure-centred/owlps-aggregator/owlps-aggregatord.c
index 91d00cd..b9d167f 100644
--- a/infrastructure-centred/owlps-aggregator/owlps-aggregatord.c
+++ b/infrastructure-centred/owlps-aggregator/owlps-aggregatord.c
@@ -409,9 +409,9 @@ void* monitor_couples()
 #endif // DEBUG
 
   sockfd =
-    owl_create_udp_sending_socket(cfg_getstr(cfg, "positioner_ip"),
-                                  cfg_getint(cfg, "positioner_port"),
-                                  &serv, &client) ;
+    owl_create_udp_trx_socket(cfg_getstr(cfg, "positioner_ip"),
+                              cfg_getint(cfg, "positioner_port"),
+                              &serv, &client) ;
 
   /* Open output file */
   fd = fopen(cfg_getstr(cfg, "output_file"), "a") ; // We use add mode
@@ -970,9 +970,9 @@ void order_send(ap_list *ap)
 #endif // DEBUG
 
   sockfd =
-    owl_create_udp_sending_socket(ap->ip_addr,
-                                  cfg_getint(cfg, "autocalibration_port"),
-                                  &serv, &client) ;
+    owl_create_udp_trx_socket(ap->ip_addr,
+                              cfg_getint(cfg, "autocalibration_port"),
+                              &serv, &client) ;
 
   message.order = htonl(AUTOCALIBRATION_ORDER_SEND) ;
   nsent = sendto(sockfd, (void *)&message, sizeof(message), 0,
diff --git a/libowlps/libowlps.c b/libowlps/libowlps.c
index 427b56b..3e58613 100644
--- a/libowlps/libowlps.c
+++ b/libowlps/libowlps.c
@@ -190,10 +190,10 @@ BOOL owl_mac_equals(uint8_t *mac1, uint8_t *mac2)
  *  - client_description (in/out): the structure in which the client
  *    description will be saved.
  */
-int owl_create_udp_sending_socket(char *server_address,
-                                  uint_fast16_t server_port,
-                                  struct sockaddr_in *server_description,
-                                  struct sockaddr_in *client_description)
+int owl_create_udp_trx_socket(char *server_address,
+                              uint_fast16_t server_port,
+                              struct sockaddr_in *server_description,
+                              struct sockaddr_in *client_description)
 {
   int sockfd ; // Socket descriptor
 
diff --git a/libowlps/owlps.h b/libowlps/owlps.h
index 7d2cc2b..46e9224 100644
--- a/libowlps/owlps.h
+++ b/libowlps/owlps.h
@@ -231,10 +231,10 @@ uint64_t owl_timestamp_to_ms(TIMESTAMP date) ;
 uint_fast32_t owl_time_elapsed(TIMESTAMP sup, TIMESTAMP inf) ;
 
 // Network
-int owl_create_udp_sending_socket(char *server_address,
-                                  uint_fast16_t server_port,
-                                  struct sockaddr_in *server_description,
-                                  struct sockaddr_in *client_description) ;
+int owl_create_udp_trx_socket(char *server_address,
+                              uint_fast16_t server_port,
+                              struct sockaddr_in *server_description,
+                              struct sockaddr_in *client_description) ;
 int owl_create_udp_listening_socket(uint_fast16_t port) ;
 int owl_iface_mode_monitor(char *iface) ;
 int owl_iface_set_channel(char *iface, uint_fast8_t channel) ;