path: root/include
diff options
authorHarald Welte <laforge@gnumonks.org>2014-08-20 22:28:23 +0200
committerHarald Welte <laforge@gnumonks.org>2014-08-20 23:16:36 +0200
commite391996947f9aa2b42377c4b797eda7db4f78c5c (patch)
tree919b1315d488d6b26cd89f410459ba3a1998f9e0 /include
parent28aa991c2fa8c27a3100530bf9d7ab5d592f4792 (diff)
ipa: rename functions for consistency
As we are breaking builds by moving functions from libosmo-abis to libosmocore anyway, we might as well give functions more appropriate names. ipaccess is a company, while IPA is the multiplex protocol, and CCM is the protocol used for establishing identities on the IPA multiplex.
Diffstat (limited to 'include')
-rw-r--r--include/osmocom/gsm/ipa.h (renamed from include/osmocom/gsm/ipaccess.h)24
2 files changed, 13 insertions, 13 deletions
diff --git a/include/Makefile.am b/include/Makefile.am
index 3b35b7b4..7484e9ea 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -58,7 +58,7 @@ nobase_include_HEADERS = \
osmocom/gsm/gsm48.h \
osmocom/gsm/gsm48_ie.h \
osmocom/gsm/gsm_utils.h \
- osmocom/gsm/ipaccess.h \
+ osmocom/gsm/ipa.h \
osmocom/gsm/lapd_core.h \
osmocom/gsm/lapdm.h \
osmocom/gsm/meas_rep.h \
diff --git a/include/osmocom/gsm/ipaccess.h b/include/osmocom/gsm/ipa.h
index dd560698..2878676f 100644
--- a/include/osmocom/gsm/ipaccess.h
+++ b/include/osmocom/gsm/ipa.h
@@ -20,41 +20,41 @@ struct ipaccess_unit {
/* obtain the human-readable name of an IPA CCM ID TAG */
-const char *ipaccess_idtag_name(uint8_t tag);
+const char *ipa_ccm_idtag_name(uint8_t tag);
/* parse a buffer of ID tags into a osmocom TLV style representation */
-int ipaccess_idtag_parse(struct tlv_parsed *dec, unsigned char *buf, int len);
+int ipa_ccm_idtag_parse(struct tlv_parsed *dec, unsigned char *buf, int len);
/* parse an Unit ID in string format into the 'ipaccess_unit' data structure */
-int ipaccess_parse_unitid(const char *str, struct ipaccess_unit *unit_data);
+int ipa_parse_unitid(const char *str, struct ipaccess_unit *unit_data);
/* fill a 'struct ipaccess_unit' based on a parsed IDTAG TLV */
-int ipaccess_tlv_to_unitdata(struct ipaccess_unit *ud,
+int ipa_ccm_tlv_to_unitdata(struct ipaccess_unit *ud,
const struct tlv_parsed *tp);
/* Send an IPA message to the given FD */
-int ipaccess_send(int fd, const void *msg, size_t msglen);
+int ipa_send(int fd, const void *msg, size_t msglen);
/* Send an IPA CCM PONG via the given FD */
-int ipaccess_send_pong(int fd);
+int ipa_ccm_send_pong(int fd);
/* Send an IPA CCM ID_ACK via the given FD */
-int ipaccess_send_id_ack(int fd);
+int ipa_ccm_send_id_ack(int fd);
/* Send an IPA CCM ID_REQ via the given FD */
-int ipaccess_send_id_req(int fd);
+int ipa_ccm_send_id_req(int fd);
/* Common handling of IPA CCM, BSC side */
-int ipaccess_rcvmsg_base(struct msgb *msg, struct osmo_fd *bfd);
+int ipa_ccm_rcvmsg_base(struct msgb *msg, struct osmo_fd *bfd);
/* Common handling of IPA CCM, BTS side */
-int ipaccess_rcvmsg_bts_base(struct msgb *msg, struct osmo_fd *bfd);
+int ipa_ccm_rcvmsg_bts_base(struct msgb *msg, struct osmo_fd *bfd);
/* prepend (push) an ipaccess_head_ext to the msgb */
-void ipaccess_prepend_header_ext(struct msgb *msg, int proto);
+void ipa_prepend_header_ext(struct msgb *msg, int proto);
/* prepend (push) an ipaccess_head to the msgb */
-void ipaccess_prepend_header(struct msgb *msg, int proto);
+void ipa_prepend_header(struct msgb *msg, int proto);
struct msgb *ipa_msg_alloc(int headroom);