paulmataruso/osmo-mgw
1
0
Fork 0
mirror of https://gitea.osmocom.org/cellular-infrastructure/osmo-mgw.git synced 2025-10-23 08:12:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

ctrl: Introduce a macro for read-only attributes and use it

Browse Source 
Certain attributes are read-only. Add a macro to make it more
easy to define those.
This commit is contained in:
Holger Hans Peter Freyther
2014-05-14 09:50:27 +02:00
parent 268b2e6544
commit 1159005ae0
2 changed files with 17 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
openbsc/include/openbsc/control_cmd.h
View File

@@ -172,6 +172,20 @@ static struct ctrl_cmd_element cmd_##cmdname = { \
.verify = &verify_##cmdname, \
}
#define CTRL_CMD_DEFINE_RO(cmdname, cmdstr) \
static int get_##cmdname(struct ctrl_cmd *cmd, void *data); \
static int set_##cmdname(struct ctrl_cmd *cmd, void *data) \
{ \
cmd->reply = "Read Only attribute"; \
return CTRL_CMD_ERROR; \
} \
static int verify_##cmdname(struct ctrl_cmd *cmd, const char *value, void *data) \
{ \
cmd->reply = "Read Only attribute"; \
return 1; \
} \
CTRL_CMD_DEFINE(cmdname, cmdstr)
struct gsm_network;
#endif /* _CONTROL_CMD_H */

38
openbsc/src/osmo-bsc/osmo_bsc_ctrl.c
View File

@@ -58,7 +58,7 @@ void osmo_bsc_send_trap(struct ctrl_cmd *cmd, struct bsc_msc_connection *msc_con
talloc_free(trap);
}
CTRL_CMD_DEFINE(msc_connection_status, "msc_connection_status");
CTRL_CMD_DEFINE_RO(msc_connection_status, "msc_connection_status");
static int msc_connection_status = 0;
static int get_msc_connection_status(struct ctrl_cmd *cmd, void *data)
@@ -70,17 +70,6 @@ static int get_msc_connection_status(struct ctrl_cmd *cmd, void *data)
return CTRL_CMD_REPLY;
}
static int set_msc_connection_status(struct ctrl_cmd *cmd, void *data)
{
return CTRL_CMD_ERROR;
}
static int verify_msc_connection_status(struct ctrl_cmd *cmd, const char *value, void *data)
{
cmd->reply = "Read-only property";
return 1;
}
static int msc_connection_status_trap_cb(unsigned int subsys, unsigned int signal, void *handler_data, void *signal_data)
{
struct ctrl_cmd *cmd;
@@ -114,7 +103,7 @@ static int msc_connection_status_trap_cb(unsigned int subsys, unsigned int signa
return 0;
}
CTRL_CMD_DEFINE(bts_connection_status, "bts_connection_status");
CTRL_CMD_DEFINE_RO(bts_connection_status, "bts_connection_status");
static int bts_connection_status = 0;
static int get_bts_connection_status(struct ctrl_cmd *cmd, void *data)
@@ -126,17 +115,6 @@ static int get_bts_connection_status(struct ctrl_cmd *cmd, void *data)
return CTRL_CMD_REPLY;
}
static int set_bts_connection_status(struct ctrl_cmd *cmd, void *data)
{
return CTRL_CMD_ERROR;
}
static int verify_bts_connection_status(struct ctrl_cmd *cmd, const char *value, void *data)
{
cmd->reply = "Read-only property";
return 1;
}
static int bts_connection_status_trap_cb(unsigned int subsys, unsigned int signal, void *handler_data, void *signal_data)
{
struct ctrl_cmd *cmd;
@@ -496,7 +474,7 @@ err:
return 1;
}
CTRL_CMD_DEFINE(bts_rf_state, "rf_state");
CTRL_CMD_DEFINE_RO(bts_rf_state, "rf_state");
static int get_bts_rf_state(struct ctrl_cmd *cmd, void *data)
{
const char *oper, *admin, *policy;
@@ -520,16 +498,6 @@ static int get_bts_rf_state(struct ctrl_cmd *cmd, void *data)
return CTRL_CMD_REPLY;
}
static int set_bts_rf_state(struct ctrl_cmd *cmd, void *data)
{
cmd->reply = "set is unimplemented";
return CTRL_CMD_ERROR;
}
static int verify_bts_rf_state(struct ctrl_cmd *cmd, const char *value, void *data)
{
return 0;
}
CTRL_CMD_DEFINE(net_rf_lock, "rf_locked");
static int get_net_rf_lock(struct ctrl_cmd *cmd, void *data)