fix(capi): updated the exteneded api names with _ext

unetsocket/c/samples/bbrecord.c

@@ -66,7 +66,7 @@ int main(int argc, char *argv[]) {
 
  // Record
  printf("Starting a record\n");
- rv = unetsocket_bbrecord(sock, buf, siglen);
+ rv = unetsocket_ext_bbrecord(sock, buf, siglen);
  if (rv == 0) {
  for(int i = 0; i < 2*siglen; i++) {
  fprintf(fptr,"%f\n", buf[i]);

unetsocket/c/samples/npulses.c

@@ -76,7 +76,7 @@ int main(int argc, char *argv[]) {
  if (sock == NULL) return error("Couldn't open unet socket");
 
  // read dac rate
- if (unetsocket_fget(sock, -1, "org.arl.unet.Services.PHYSICAL", "dacrate", &txsamplingfreq) < 0) {
+ if (unetsocket_ext_fget(sock, -1, "org.arl.unet.Services.PHYSICAL", "dacrate", &txsamplingfreq) < 0) {
  return error("Failed to get dacrate parameter \n");
  } else {
  printf("Using %1.1f samples/s\n", txsamplingfreq);
@@ -89,7 +89,7 @@ int main(int argc, char *argv[]) {
 
  // Transmit signal
  printf("Transmitting a CW\n");
- rv = unetsocket_npulses(sock, signal, siglen, (int)txsamplingfreq, n, pri);
+ rv = unetsocket_ext_npulses(sock, signal, siglen, (int)txsamplingfreq, n, pri);
  if (rv != 0) return error("Error transmitting signal");
 
  // Close the unet socket

unetsocket/c/samples/pbrecord.c

@@ -65,7 +65,7 @@ int main(int argc, char *argv[]) {
 
  // Record
  printf("Starting a record\n");
- rv = unetsocket_pbrecord(sock, buf, siglen);
+ rv = unetsocket_ext_pbrecord(sock, buf, siglen);
  if (rv == 0) {
  for(int i = 0; i < siglen; i++) {
  fprintf(fptr,"%f\n", buf[i]);

unetsocket/c/samples/range.c

@@ -60,7 +60,7 @@ int main(int argc, char *argv[]) {
  if (sock == NULL) return error("Couldn't open unet socket");
 
  // ranging
- rv = unetsocket_get_range(sock, address, range);
+ rv = unetsocket_ext_get_range(sock, address, range);
  if (rv == 0) {
  printf("Range measured is : %f \n", *range);
  } else {

unetsocket/c/samples/rs232_wakeup.c

@@ -40,7 +40,7 @@ int main(int argc, char *argv[])
  return -1;
  }
  for (int i = 0; i < ACTIVITYONSERIAL; i++) {
- ret = unetsocket_rs232_wakeup(argv[1], 115200, "N81");
+ ret = unetsocket_ext_rs232_wakeup(argv[1], 115200, "N81");
  if (ret == 0) printf("Started activity on RS232 port..\n");
  }
  printf("Wakeup packet sent.\n");

unetsocket/c/samples/setpowerlevel.c

@@ -59,11 +59,11 @@ int main(int argc, char *argv[]) {
  if (sock == NULL) return error("Couldn't open unet socket");
 
  // set power level of the CONTROL frame
- rv = unetsocket_set_powerlevel(sock, 1, power_value);
+ rv = unetsocket_ext_set_powerlevel(sock, 1, power_value);
  if (rv == 0) printf("Transmission power level of CONTROL frame set to : %f \n", power_value);
 
  // set power level of the DATA frame
- rv = unetsocket_set_powerlevel(sock, 2, power_value);
+ rv = unetsocket_ext_set_powerlevel(sock, 2, power_value);
  if (rv == 0) printf("Transmission power level of DATA frame set to : %f \n", power_value);
 
  // Close the unet socket

unetsocket/c/samples/txdata.c

@@ -33,7 +33,7 @@ int main(int argc, char *argv[]) {
  uint8_t data[NBYTES] = {1, 2, 3, 4, 5, 6, 7, 8, 9};
  int rv;
  if (argc <= 2) {
- error("Usage : txdata <ip_address> <rx_node_address> <port> \n"
+ error("Usage : txdata <ip_address> <rx_node_address> [port] \n"
  "ip_address: IP address of the transmitter modem. \n"
  "rx_node_address: Node address of the receiver modem. \n"
  "port: port number of transmitter modem. \n"

unetsocket/c/samples/txsignal.c

@@ -99,7 +99,7 @@ int main(int argc, char *argv[]) {
  if (sock == NULL) return error("Couldn't open unet socket");
 
  // read dac rate
- if (unetsocket_fget(sock, -1, "org.arl.unet.Services.PHYSICAL", "dacrate", &txsamplingfreq) < 0) {
+ if (unetsocket_ext_fget(sock, -1, "org.arl.unet.Services.PHYSICAL", "dacrate", &txsamplingfreq) < 0) {
  return error("Failed to get dacrate parameter \n");
  } else {
  printf("Using %1.1f samples/s\n", txsamplingfreq);
@@ -108,7 +108,7 @@ int main(int argc, char *argv[]) {
  // Transmit signal
  printf("Transmitting a CW\n");
  printf("Using signal from %s file \n", filename);
- rv = unetsocket_tx_signal(sock, txbuf, txbufsize, 0, id);
+ rv = unetsocket_ext_tx_signal(sock, txbuf, txbufsize, 0, id);
  if (rv != 0) return error("Error transmitting signal");
 
  // Close the unet socket

unetsocket/c/samples/wakeup.c

@@ -71,7 +71,7 @@ int main(int argc, char *argv[])
  char *addr = argv[1];
  ret = packMacAddr(addr, mac_addr);
  if (ret < 0) return ret;
- ret = unetsocket_ethernet_wakeup(mac_addr);
+ ret = unetsocket_ext_ethernet_wakeup(mac_addr);
  if (ret < 0) return ret;
  printf("Wakeup packet sent.\n");
  return 0;

unetsocket/c/unet_ext.c

@@ -100,7 +100,7 @@ static int agents_for_service(_unetsocket_t *usock, const char *service, fjage_a
  return as;
 }
 
-int unetsocket_get_range(unetsocket_t sock, int to, float* range) {
+int unetsocket_ext_get_range(unetsocket_t sock, int to, float* range) {
  if (sock == NULL) return -1;
  _unetsocket_t *usock = sock;
  fjage_aid_t ranging;
@@ -124,7 +124,7 @@ int unetsocket_get_range(unetsocket_t sock, int to, float* range) {
  return -1;
 }
 
-int unetsocket_set_powerlevel(unetsocket_t sock, int index, float value) {
+int unetsocket_ext_set_powerlevel(unetsocket_t sock, int index, float value) {
  if (sock == NULL) return -1;
  _unetsocket_t *usock = sock;
  fjage_msg_t msg;
@@ -147,7 +147,7 @@ int unetsocket_set_powerlevel(unetsocket_t sock, int index, float value) {
  return -1;
 }
 
-int unetsocket_npulses(unetsocket_t sock, float *signal, int nsamples, int rate, int npulses, int pri) {
+int unetsocket_ext_npulses(unetsocket_t sock, float *signal, int nsamples, int rate, int npulses, int pri) {
  if (sock == NULL) return -1;
  if (nsamples < 0) return -1;
  if (nsamples > 0 && signal == NULL) return -1;
@@ -163,14 +163,14 @@ int unetsocket_npulses(unetsocket_t sock, float *signal, int nsamples, int rate,
  error("Pulse delay is less than 5 ms...");
  return -1;
  }
- if ((unetsocket_iget(usock, 0, "org.arl.unet.Services.PHYSICAL", "npulses", &npulses_cache) < 0) || (unetsocket_iset(usock, 0, "org.arl.unet.Services.PHYSICAL", "npulses", npulses) < 0))
+ if ((unetsocket_ext_iget(usock, 0, "org.arl.unet.Services.PHYSICAL", "npulses", &npulses_cache) < 0) || (unetsocket_ext_iset(usock, 0, "org.arl.unet.Services.PHYSICAL", "npulses", npulses) < 0))
  {
  error("Unable to get/set npulses...");
  return -1;
  }
- if ((unetsocket_iget(usock, 0, "org.arl.unet.Services.PHYSICAL", "pulsedelay", &pulsedelay_cache) < 0) || (unetsocket_iset(usock, 0, "org.arl.unet.Services.PHYSICAL", "pulsedelay", pulsedelay) < 0))
+ if ((unetsocket_ext_iget(usock, 0, "org.arl.unet.Services.PHYSICAL", "pulsedelay", &pulsedelay_cache) < 0) || (unetsocket_ext_iset(usock, 0, "org.arl.unet.Services.PHYSICAL", "pulsedelay", pulsedelay) < 0))
  {
- unetsocket_iset(usock, 0, "org.arl.unet.Services.PHYSICAL", "npulses", npulses_cache);
+ unetsocket_ext_iset(usock, 0, "org.arl.unet.Services.PHYSICAL", "npulses", npulses_cache);
  error("Unable to get/set pulse delay...");
  return -1;
  }
@@ -184,18 +184,18 @@ int unetsocket_npulses(unetsocket_t sock, float *signal, int nsamples, int rate,
  {
  fjage_msg_destroy(msg);
  msg = receive(usock, "org.arl.unet.phy.TxFrameNtf", NULL, (pri*npulses)+(2*TIMEOUT));
- unetsocket_iset(usock, 0, "org.arl.unet.Services.PHYSICAL", "npulses", npulses_cache);
- unetsocket_iset(usock, 0, "org.arl.unet.Services.PHYSICAL", "pulsedelay", pulsedelay_cache);
+ unetsocket_ext_iset(usock, 0, "org.arl.unet.Services.PHYSICAL", "npulses", npulses_cache);
+ unetsocket_ext_iset(usock, 0, "org.arl.unet.Services.PHYSICAL", "pulsedelay", pulsedelay_cache);
  fjage_msg_destroy(msg);
  return 0;
  }
  fjage_msg_destroy(msg);
- unetsocket_iset(usock, 0, "org.arl.unet.Services.PHYSICAL", "npulses", npulses_cache);
- unetsocket_iset(usock, 0, "org.arl.unet.Services.PHYSICAL", "pulsedelay", pulsedelay_cache);
+ unetsocket_ext_iset(usock, 0, "org.arl.unet.Services.PHYSICAL", "npulses", npulses_cache);
+ unetsocket_ext_iset(usock, 0, "org.arl.unet.Services.PHYSICAL", "pulsedelay", pulsedelay_cache);
  return -1;
 }
 
-int unetsocket_iset(unetsocket_t sock, int index, char *target_name, char *param_name, int value)
+int unetsocket_ext_iset(unetsocket_t sock, int index, char *target_name, char *param_name, int value)
 {
  if (sock == NULL) return -1;
  _unetsocket_t *usock = sock;
@@ -221,7 +221,7 @@ int unetsocket_iset(unetsocket_t sock, int index, char *target_name, char *param
  return -1;
 }
 
-int unetsocket_fset(unetsocket_t sock, int index, char *target_name, char *param_name, float value)
+int unetsocket_ext_fset(unetsocket_t sock, int index, char *target_name, char *param_name, float value)
 {
  if (sock == NULL) return -1;
  _unetsocket_t *usock = sock;
@@ -247,7 +247,7 @@ int unetsocket_fset(unetsocket_t sock, int index, char *target_name, char *param
  return -1;
 }
 
-int unetsocket_bset(unetsocket_t sock, int index, char *target_name, char *param_name, bool value)
+int unetsocket_ext_bset(unetsocket_t sock, int index, char *target_name, char *param_name, bool value)
 {
  if (sock == NULL) return -1;
  _unetsocket_t *usock = sock;
@@ -273,7 +273,7 @@ int unetsocket_bset(unetsocket_t sock, int index, char *target_name, char *param
  return -1;
 }
 
-int unetsocket_sset(unetsocket_t sock, int index, char *target_name, char *param_name, char *value)
+int unetsocket_ext_sset(unetsocket_t sock, int index, char *target_name, char *param_name, char *value)
 {
  if (sock == NULL) return -1;
  _unetsocket_t *usock = sock;
@@ -299,7 +299,7 @@ int unetsocket_sset(unetsocket_t sock, int index, char *target_name, char *param
  return -1;
 }
 
-int unetsocket_iget(unetsocket_t sock, int index, char *target_name, char *param_name, int *value)
+int unetsocket_ext_iget(unetsocket_t sock, int index, char *target_name, char *param_name, int *value)
 {
  if (sock == NULL) return -1;
  _unetsocket_t *usock = sock;
@@ -325,7 +325,7 @@ int unetsocket_iget(unetsocket_t sock, int index, char *target_name, char *param
  return -1;
 }
 
-int unetsocket_fget(unetsocket_t sock, int index, char *target_name, char *param_name, float *value)
+int unetsocket_ext_fget(unetsocket_t sock, int index, char *target_name, char *param_name, float *value)
 {
  if (sock == NULL) return -1;
  _unetsocket_t *usock = sock;
@@ -351,7 +351,7 @@ int unetsocket_fget(unetsocket_t sock, int index, char *target_name, char *param
  return -1;
 }
 
-int unetsocket_bget(unetsocket_t sock, int index, char *target_name, char *param_name, bool *value)
+int unetsocket_ext_bget(unetsocket_t sock, int index, char *target_name, char *param_name, bool *value)
 {
  if (sock == NULL) return -1;
  _unetsocket_t *usock = sock;
@@ -377,7 +377,7 @@ int unetsocket_bget(unetsocket_t sock, int index, char *target_name, char *param
  return -1;
 }
 
-int unetsocket_sget(unetsocket_t sock, int index, char *target_name, char *param_name, char *buf, int buflen)
+int unetsocket_ext_sget(unetsocket_t sock, int index, char *target_name, char *param_name, char *buf, int buflen)
 {
  if (sock == NULL) return -1;
  _unetsocket_t *usock = sock;
@@ -403,14 +403,14 @@ int unetsocket_sget(unetsocket_t sock, int index, char *target_name, char *param
  return -1;
 }
 
-int unetsocket_pbrecord(unetsocket_t sock, float *buf, int nsamples) {
+int unetsocket_ext_pbrecord(unetsocket_t sock, float *buf, int nsamples) {
  if (sock == NULL) return -1;
  if (nsamples <= 0 || buf == NULL) return -1;
  _unetsocket_t *usock = sock;
  int pbscnt = 0;
  float tempbuf[PBSBLK];
  pbscnt = (int)ceil((float)nsamples / PBSBLK);
- if (unetsocket_iset(usock, 0, "org.arl.unet.Services.PHYSICAL", "pbscnt", pbscnt) < 0) return -1;
+ if (unetsocket_ext_iset(usock, 0, "org.arl.unet.Services.PHYSICAL", "pbscnt", pbscnt) < 0) return -1;
  for (int i = 0; i < pbscnt; i++)
  {
  fjage_msg_t rxsigntf = receive(usock, "org.arl.unet.bb.RxBasebandSignalNtf", NULL, 5 * TIMEOUT);
@@ -422,7 +422,7 @@ int unetsocket_pbrecord(unetsocket_t sock, float *buf, int nsamples) {
  return 0;
 }
 
-int unetsocket_tx_signal(unetsocket_t sock, float *signal, int nsamples, float fc, char *id) {
+int unetsocket_ext_tx_signal(unetsocket_t sock, float *signal, int nsamples, float fc, char *id) {
  if (sock == NULL) return -1;
  if (nsamples < 0) return -1;
  if (nsamples > 0 && signal == NULL) return -1;
@@ -445,7 +445,7 @@ int unetsocket_tx_signal(unetsocket_t sock, float *signal, int nsamples, float f
  return -1;
 }
 
-int unetsocket_bbrecord(unetsocket_t sock, float *buf, int nsamples) {
+int unetsocket_ext_bbrecord(unetsocket_t sock, float *buf, int nsamples) {
  if (sock == NULL) return -1;
  if (nsamples <= 0 || buf == NULL) return -1;
  _unetsocket_t *usock = sock;
@@ -469,7 +469,7 @@ int unetsocket_bbrecord(unetsocket_t sock, float *buf, int nsamples) {
  return -1;
 }
 
-int unetsocket_rs232_wakeup(char *devname, int baud, const char *settings)
+int unetsocket_ext_rs232_wakeup(char *devname, int baud, const char *settings)
 {
  if (fjage_rs232_wakeup(devname, baud, settings) == -1)
  {
@@ -478,7 +478,7 @@ int unetsocket_rs232_wakeup(char *devname, int baud, const char *settings)
  return 0;
 }
 
-int unetsocket_ethernet_wakeup(unsigned char *macaddr)
+int unetsocket_ext_ethernet_wakeup(unsigned char *macaddr)
 {
  int i;
  unsigned char toSend[102];
@@ -508,7 +508,7 @@ int unetsocket_ethernet_wakeup(unsigned char *macaddr)
  return 0;
 }
 
-int unetsocket_sleep(unetsocket_t sock)
+int unetsocket_ext_sleep(unetsocket_t sock)
 {
  if (sock == NULL) return -1;
  _unetsocket_t *usock = sock;