chao
/
linuxptp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

transport: Fix callers to pass a proper enumeration value. 

The majority of the callers of transport_send() use hard coded magic
numbers.  This patch fixes them to use the corresponding enumerated
values instead.

Signed-off-by: Richard Cochran <richardcochran@gmail.com>
master
Richard Cochran 2018-03-16 23:35:09 -07:00
parent 4247eeb104
commit a1c5e3f2ed
5 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clock.c
View File

@ -470,7 +470,7 @@ static int clock_management_get_response(struct clock *c, struct port *p,
} }
respond = clock_management_fill_response(c, p, req, rsp, id); respond = clock_management_fill_response(c, p, req, rsp, id);
if (respond) if (respond)
port_prepare_and_send(p, rsp, 0); port_prepare_and_send(p, rsp, TRANS_GENERAL);
msg_put(rsp); msg_put(rsp);
return respond; return respond;
} }

2
nsm.c
View File

@ -436,7 +436,7 @@ static int nsm_request(struct nsm *nsm, char *target)
pr_err("msg_pre_send failed"); pr_err("msg_pre_send failed");
goto out; goto out;
} }
cnt = transport_sendto(nsm->trp, &nsm->fda, 1, msg); cnt = transport_sendto(nsm->trp, &nsm->fda, TRANS_EVENT, msg);
if (cnt <= 0) { if (cnt <= 0) {
pr_err("transport_sendto failed"); pr_err("transport_sendto failed");
err = -1; err = -1;

3
pmc_common.c
View File

@ -160,7 +160,8 @@ static int pmc_send(struct pmc *pmc, struct ptp_message *msg)
pr_err("msg_pre_send failed"); pr_err("msg_pre_send failed");
return -1; return -1;
} }
return transport_send(pmc->transport, &pmc->fdarray, 0, msg); return transport_send(pmc->transport, &pmc->fdarray,
TRANS_GENERAL, msg);
} }
static int pmc_tlv_datalen(struct pmc *pmc, int id) static int pmc_tlv_datalen(struct pmc *pmc, int id)

19
port.c
View File

@ -940,7 +940,7 @@ static int port_management_get_response(struct port *target,
} }
respond = port_management_fill_response(target, rsp, id); respond = port_management_fill_response(target, rsp, id);
if (respond) if (respond)
port_prepare_and_send(ingress, rsp, 0); port_prepare_and_send(ingress, rsp, TRANS_GENERAL);
msg_put(rsp); msg_put(rsp);
return respond; return respond;
} }
@ -1297,7 +1297,7 @@ int port_delay_request(struct port *p)
msg->header.flagField[0] |= UNICAST; msg->header.flagField[0] |= UNICAST;
} }
if (port_prepare_and_send(p, msg, 1)) { if (port_prepare_and_send(p, msg, TRANS_EVENT)) {
pr_err("port %hu: send delay request failed", portnum(p)); pr_err("port %hu: send delay request failed", portnum(p));
goto out; goto out;
} }
@ -1354,7 +1354,7 @@ static int port_tx_announce(struct port *p)
pr_err("port %hu: append path trace failed", portnum(p)); pr_err("port %hu: append path trace failed", portnum(p));
} }
err = port_prepare_and_send(p, msg, 0); err = port_prepare_and_send(p, msg, TRANS_GENERAL);
if (err) { if (err) {
pr_err("port %hu: send announce failed", portnum(p)); pr_err("port %hu: send announce failed", portnum(p));
} }
@ -1457,7 +1457,7 @@ static int port_tx_sync(struct port *p, struct address *dst)
goto out; goto out;
} }
err = port_prepare_and_send(p, fup, 0); err = port_prepare_and_send(p, fup, TRANS_GENERAL);
if (err) { if (err) {
pr_err("port %hu: send follow up failed", portnum(p)); pr_err("port %hu: send follow up failed", portnum(p));
} }
@ -1758,7 +1758,7 @@ static int process_delay_req(struct port *p, struct ptp_message *m)
err = -1; err = -1;
goto out; goto out;
} }
err = port_prepare_and_send(p, msg, 0); err = port_prepare_and_send(p, msg, TRANS_GENERAL);
if (err) { if (err) {
pr_err("port %hu: send delay response failed", portnum(p)); pr_err("port %hu: send delay response failed", portnum(p));
goto out; goto out;
@ -2533,18 +2533,19 @@ static enum fsm_event bc_event(struct port *p, int fd_index)
int port_forward(struct port *p, struct ptp_message *msg) int port_forward(struct port *p, struct ptp_message *msg)
{ {
int cnt; int cnt;
cnt = transport_send(p->trp, &p->fda, 0, msg); cnt = transport_send(p->trp, &p->fda, TRANS_GENERAL, msg);
return cnt <= 0 ? -1 : 0; return cnt <= 0 ? -1 : 0;
} }
int port_forward_to(struct port *p, struct ptp_message *msg) int port_forward_to(struct port *p, struct ptp_message *msg)
{ {
int cnt; int cnt;
cnt = transport_sendto(p->trp, &p->fda, 0, msg); cnt = transport_sendto(p->trp, &p->fda, TRANS_GENERAL, msg);
return cnt <= 0 ? -1 : 0; return cnt <= 0 ? -1 : 0;
} }
int port_prepare_and_send(struct port *p, struct ptp_message *msg, int event) int port_prepare_and_send(struct port *p, struct ptp_message *msg,
enum transport_event event)
{ {
int cnt; int cnt;
@ -2658,7 +2659,7 @@ int port_management_error(struct PortIdentity pid, struct port *ingress,
mes->error = error_id; mes->error = error_id;
mes->id = mgt->id; mes->id = mgt->id;
err = port_prepare_and_send(ingress, msg, 0); err = port_prepare_and_send(ingress, msg, TRANS_GENERAL);
msg_put(msg); msg_put(msg);
return err; return err;
} }

6
port.h
View File

@ -105,10 +105,10 @@ int port_forward_to(struct port *p, struct ptp_message *msg);
* port_forward if you need to send single message to several ports. * port_forward if you need to send single message to several ports.
* @param p A pointer previously obtained via port_open(). * @param p A pointer previously obtained via port_open().
* @param msg The message to send. * @param msg The message to send.
* @param event 0 if the message is a general message, 1 if it is an * @param event One of the @ref transport_event enumeration values.
* event message.
*/ */
int port_prepare_and_send(struct port *p, struct ptp_message *msg, int event); int port_prepare_and_send(struct port *p, struct ptp_message *msg,
enum transport_event event);
/** /**
* Obtain a port's identity. * Obtain a port's identity.