pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29748 )

Change subject: mgcp-client: Rearrange order of structs and APIs in header ......................................................................

mgcp-client: Rearrange order of structs and APIs in header

Move mgcp_client_pool up in the file as a preparation for next commit, where pool_member will have a pointer to the pool added. The related APIs on the object are also moved up in the file.

Change-Id: I9ff9c6e1e722690835c5d59b1fa87fb7d9e3120c --- M include/osmocom/mgcp_client/mgcp_client_pool_internal.h 1 file changed, 21 insertions(+), 20 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/48/29748/1

diff --git a/include/osmocom/mgcp_client/mgcp_client_pool_internal.h b/include/osmocom/mgcp_client/mgcp_client_pool_internal.h index d9beb6f..91e5a45 100644 --- a/include/osmocom/mgcp_client/mgcp_client_pool_internal.h +++ b/include/osmocom/mgcp_client/mgcp_client_pool_internal.h @@ -1,5 +1,26 @@ #pragma once

+/* Struct to handle a pool of MGWs. (Use _pool functions) */ +struct mgcp_client_pool { + + /* A pointer to a 'single' mgcp client. This is a non-pooled MGCP client that is configured using + * mgcp_client_vty_init() and actively registered by the API user using mgcp_client_pool_register_single() */ + struct mgcp_client *mgcp_client_single; + + /* A list that manages the pool members (see mgcp_client_pool_member->list above) */ + struct llist_head member_list; + + /* String to use for indentation when writing the configuration file to the VTY. This field is populated by + * mgcp_client_pool_vty_init() */ + char *vty_indent; + + /* VTY node specification used with this pool. This field is populated by mgcp_client_pool_vty_init() */ + struct cmd_node *vty_node; +}; + +struct mgcp_client_pool_member *mgcp_client_pool_find_member_by_nr(struct mgcp_client_pool *pool, unsigned int nr); + + /* Struct to handle a member of a pool of MGWs. */ struct mgcp_client_pool_member { /* Entry in llist mgcp_client_pool->pool. */ @@ -25,26 +46,6 @@ unsigned int refcount; };

-/* Struct to handle a pool of MGWs. (Use _pool functions) */ -struct mgcp_client_pool { - - /* A pointer to a 'single' mgcp client. This is a non-pooled MGCP client that is configured using - * mgcp_client_vty_init() and actively registered by the API user using mgcp_client_pool_register_single() */ - struct mgcp_client *mgcp_client_single; - - /* A list that manages the pool members (see mgcp_client_pool_member->list above) */ - struct llist_head member_list; - - /* String to use for indentation when writing the configuration file to the VTY. This field is populated by - * mgcp_client_pool_vty_init() */ - char *vty_indent; - - /* VTY node specification used with this pool. This field is populated by mgcp_client_pool_vty_init() */ - struct cmd_node *vty_node; -}; - -struct mgcp_client_pool_member *mgcp_client_pool_find_member_by_nr(struct mgcp_client_pool *pool, unsigned int nr); - struct mgcp_client_pool_member *mgcp_client_pool_member_alloc(struct mgcp_client_pool *pool, unsigned int nr); void mgcp_client_pool_member_free(struct mgcp_client_pool_member *pool_member); int mgcp_client_pool_member_reinit_client(struct mgcp_client_pool_member *pool_member, struct mgcp_client_pool *pool);