diff options
author | Sean Bright <sean.bright@gmail.com> | 2017-12-22 09:23:22 -0500 |
---|---|---|
committer | Sean Bright <sean.bright@gmail.com> | 2017-12-22 09:23:22 -0500 |
commit | fd0ca1c3f9b972a52d48a82b492fd6bac772dc78 (patch) | |
tree | 42d2a87726d196f4db1c68489007520a4c597062 /res/res_pktccops.c | |
parent | 9ef97b5a9191e51f1edc66bb17728fd9fe552c35 (diff) |
Remove as much trailing whitespace as possible.
Change-Id: I873c1c6d00f447269bd841494459efccdd2c19c0
Diffstat (limited to 'res/res_pktccops.c')
-rw-r--r-- | res/res_pktccops.c | 71 |
1 files changed, 35 insertions, 36 deletions
diff --git a/res/res_pktccops.c b/res/res_pktccops.c index 156c49dc7..3a12285cb 100644 --- a/res/res_pktccops.c +++ b/res/res_pktccops.c @@ -19,10 +19,10 @@ /*!\file * * \brief PacketCable COPS - * + * * \author Attila Domjan <attila.domjan.hu@gmail.com> * - * \note + * \note * This module is an add-on to chan_mgcp. It adds support for the * PacketCable MGCP variation called NCS. Res_pktccops implements COPS * (RFC 2748), a protocol used to manage dynamic bandwith allocation in @@ -94,7 +94,7 @@ struct pktcobj { unsigned char cnum; unsigned char ctype; char *contents; - struct pktcobj *next; + struct pktcobj *next; }; struct copsmsg { @@ -134,7 +134,7 @@ struct cops_cmts { char name[80]; char host[80]; char port[80]; - uint16_t t1; + uint16_t t1; uint16_t t7; uint16_t t8; uint32_t keepalive; @@ -184,7 +184,7 @@ static uint16_t cops_constructgatespec(struct gatespec *gs, char *res) if (res == NULL) { return 0; } - + *res = (char) gs->direction; *(res + 1) = (char) gs->protocolid; *(res + 2) = (char) gs->flags; @@ -224,7 +224,7 @@ static uint16_t cops_construct_gate (int cmd, char *p, uint16_t trid, { struct gatespec gs; int offset = 0; - + ast_debug(3, "CMD: %d\n", cmd); /* Transaction Identifier 8 octets */ @@ -244,7 +244,7 @@ static uint16_t cops_construct_gate (int cmd, char *p, uint16_t trid, *(p + offset++) = 1; /* stype */ *((uint32_t *) (p + offset)) = htonl(mtahost); offset += 4; - + if (cmd == GATE_INFO || cmd == GATE_SET_HAVE_GATEID || cmd == GATE_DEL) { /* Gate ID 8 Octets */ *(p + offset++) = 0; @@ -256,7 +256,7 @@ static uint16_t cops_construct_gate (int cmd, char *p, uint16_t trid, if (cmd == GATE_INFO || cmd == GATE_DEL) { return offset; } - + } /* Activity Count 8 octets */ @@ -390,7 +390,7 @@ static int cops_sendmsg (int sfd, struct copsmsg * sendmsg) char *buf; int bufpos; struct pktcobj *pobject; - + if (sfd < 0) { return -1; } @@ -433,7 +433,7 @@ static int cops_sendmsg (int sfd, struct copsmsg * sendmsg) pobject = pobject->next; } } - + errno = 0; #ifdef HAVE_MSG_NOSIGNAL #define SENDFLAGS MSG_NOSIGNAL | MSG_DONTWAIT @@ -479,15 +479,15 @@ struct cops_gate * AST_OPTIONAL_API_NAME(ast_pktccops_gate_alloc)(int cmd, ast_debug(3, "------- gate modify gateid 0x%x ssip: 0x%x\n", gate->gateid, ssip); /* TODO implement it */ ast_log(LOG_WARNING, "Modify GateID not implemented\n"); - } - + } + if ((gate = cops_gate_cmd(cmd, NULL, cops_trid++, mta, actcount, bitrate, psize, ssip, ssport, gate))) { ast_debug(3, "COPS: Allocating gate for mta: 0x%x\n", mta); gate->got_dq_gi = got_dq_gi; gate->gate_remove = gate_remove; return(gate); } else { - ast_debug(3, "COPS: Couldn't allocate gate for mta: 0x%x\n", mta); + ast_debug(3, "COPS: Couldn't allocate gate for mta: 0x%x\n", mta); return NULL; } } @@ -550,7 +550,7 @@ static struct cops_gate *cops_gate_cmd(int cmd, struct cops_cmts *cmts, gate->trid = trid; } } - + gate->in_transaction = time(NULL); if (!(gateset = ast_malloc(sizeof(struct copsmsg)))) { @@ -561,7 +561,7 @@ static struct cops_gate *cops_gate_cmd(int cmd, struct cops_cmts *cmts, gateset->verflag = 0x10; gateset->opcode = 2; /* Decision */ gateset->clienttype = 0x8008; /* =PacketCable */ - + /* Handle object */ gateset->object = ast_malloc(sizeof(struct pktcobj)); if (!gateset->object) { @@ -627,7 +627,7 @@ static struct cops_gate *cops_gate_cmd(int cmd, struct cops_cmts *cmts, return NULL; } gateset->object->next->next->next->next = NULL; - + gateset->length = COPS_HEADER_SIZE + gateset->object->length + gateset->object->next->length + gateset->object->next->next->length + gateset->object->next->next->next->length; if ((cmd == GATE_INFO || cmd == GATE_SET_HAVE_GATEID || cmd == GATE_DEL) && gate) { @@ -658,7 +658,7 @@ static int cops_connect(char *host, char *port) memset(&hints, 0, sizeof(struct addrinfo)); - hints.ai_family = AF_UNSPEC; + hints.ai_family = AF_UNSPEC; hints.ai_socktype = SOCK_STREAM; hints.ai_flags = 0; hints.ai_protocol = 0; @@ -824,7 +824,7 @@ static void *do_pktccops(void *data) ast_debug(3, " S-Num S-type: 0x%.4x len: %i\n", (unsigned)snst, sobjlen); if (snst == 0x0101 ) { recvtrid = ntohs(*((uint16_t *) (sobjp + 4))); - scommand = ntohs(*((uint16_t *) (sobjp + 6))); + scommand = ntohs(*((uint16_t *) (sobjp + 6))); ast_debug(3, " Transaction Identifier command: %i trid %i\n", scommand, recvtrid); } else if (snst == 0x0201) { subscrid = ntohl(*((uint32_t *) (sobjp + 4))); @@ -870,7 +870,7 @@ static void *do_pktccops(void *data) gate->gate_open = NULL; } break; - } + } } } AST_LIST_TRAVERSE_SAFE_END; @@ -941,7 +941,7 @@ static void *do_pktccops(void *data) cmts->state = 2; cmts->katimer = time(NULL); } - } + } if (len <= 0) { ast_debug(3, "COPS: lost connection to %s\n", cmts->name); close(cmts->sfd); @@ -951,7 +951,7 @@ static void *do_pktccops(void *data) cops_freemsg(recmsg); } } - AST_LIST_UNLOCK(&cmts_list); + AST_LIST_UNLOCK(&cmts_list); } if (pktcreload) { ast_debug(3, "Reloading pktccops...\n"); @@ -1056,7 +1056,7 @@ static int load_pktccops_config(void) } else { ast_log(LOG_WARNING, "Unkown option %s in general section of res_ptkccops.conf\n", v->name); } - } + } } else { /* Defaults */ host = NULL; @@ -1068,7 +1068,7 @@ static int load_pktccops_config(void) for (v = ast_variable_browse(config, cat); v; v = v->next) { if (!strcasecmp(v->name, "host")) { - host = v->value; + host = v->value; } else if (!strcasecmp(v->name, "port")) { port = v->value; } else if (!strcasecmp(v->name, "t1")) { @@ -1152,11 +1152,11 @@ static char *pktccops_show_cmtses(struct ast_cli_entry *e, int cmd, struct ast_c struct cops_cmts *cmts; char statedesc[16]; int katimer; - + switch(cmd) { case CLI_INIT: e->command = "pktccops show cmtses"; - e->usage = + e->usage = "Usage: pktccops show cmtses\n" " List PacketCable COPS CMTSes.\n"; @@ -1192,7 +1192,7 @@ static char *pktccops_show_gates(struct ast_cli_entry *e, int cmd, struct ast_cl switch(cmd) { case CLI_INIT: e->command = "pktccops show gates"; - e->usage = + e->usage = "Usage: pktccops show gates\n" " List PacketCable COPS GATEs.\n"; @@ -1223,8 +1223,8 @@ static char *pktccops_show_gates(struct ast_cli_entry *e, int cmd, struct ast_cl } else { ast_copy_string(state_desc, "N/A", sizeof(state_desc)); } - - ast_cli(a->fd, "%-16s 0x%.8x 0x%08x %-10s %10i %10i %u\n", (gate->cmts) ? gate->cmts->name : "null" , gate->gateid, gate->mta, + + ast_cli(a->fd, "%-16s 0x%.8x 0x%08x %-10s %10i %10i %u\n", (gate->cmts) ? gate->cmts->name : "null" , gate->gateid, gate->mta, state_desc, (int) (time(NULL) - gate->allocated), (gate->checked) ? (int) (time(NULL) - gate->checked) : 0, (unsigned int) gate->in_transaction); } AST_LIST_UNLOCK(&cmts_list); @@ -1241,7 +1241,7 @@ static char *pktccops_show_pools(struct ast_cli_entry *e, int cmd, struct ast_cl switch(cmd) { case CLI_INIT: e->command = "pktccops show pools"; - e->usage = + e->usage = "Usage: pktccops show pools\n" " List PacketCable COPS ip pools of MTAs.\n"; @@ -1274,7 +1274,7 @@ static char *pktccops_gatedel(struct ast_cli_entry *e, int cmd, struct ast_cli_a switch (cmd) { case CLI_INIT: e->command = "pktccops gatedel"; - e->usage = + e->usage = "Usage: pktccops gatedel <cmts> <gateid>\n" " Send Gate-Del to cmts.\n"; return NULL; @@ -1294,13 +1294,13 @@ static char *pktccops_gatedel(struct ast_cli_entry *e, int cmd, struct ast_cli_a } } AST_LIST_UNLOCK(&cmts_list); - + if (!found) return CLI_SHOWUSAGE; trid = cops_trid++; if (!sscanf(a->argv[3], "%x", &gateid)) { - ast_cli(a->fd, "bad gate specification (%s)\n", a->argv[3]); + ast_cli(a->fd, "bad gate specification (%s)\n", a->argv[3]); return CLI_SHOWUSAGE; } @@ -1312,7 +1312,7 @@ static char *pktccops_gatedel(struct ast_cli_entry *e, int cmd, struct ast_cli_a break; } } - + if (!found) { ast_cli(a->fd, "gate not found: %s\n", a->argv[3]); return CLI_SHOWUSAGE; @@ -1334,7 +1334,7 @@ static char *pktccops_gateset(struct ast_cli_entry *e, int cmd, struct ast_cli_a switch (cmd) { case CLI_INIT: e->command = "pktccops gateset"; - e->usage = + e->usage = "Usage: pktccops gateset <cmts> <mta> <acctcount> <bitrate> <packet size> <switch ip> <switch port>\n" " Send Gate-Set to cmts.\n"; return NULL; @@ -1385,7 +1385,7 @@ static char *pktccops_debug(struct ast_cli_entry *e, int cmd, struct ast_cli_arg switch (cmd) { case CLI_INIT: e->command = "pktccops set debug {on|off}"; - e->usage = + e->usage = "Usage: pktccops set debug {on|off}\n" " Turn on/off debuging\n"; return NULL; @@ -1517,4 +1517,3 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "PktcCOPS manager .unload = unload_module, .reload = reload_module, ); - |