| Message ID | 1601386397-21067-2-git-send-email-loic.poulain@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/2] net: qrtr: Allow forwarded services | expand |
On Tue 29 Sep 08:33 CDT 2020, Loic Poulain wrote: > In order to reach non-immediate remote node services that are > accessed through an intermediate node, the route to the remote > node needs to be saved. > > E.g for a [node1 <=> node2 <=> node3] network > - node2 forwards node3 service to node1 > - node1 must save node2 as route for reaching node3 > > Signed-off-by: Loic Poulain <loic.poulain@linaro.org> Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> Regards, Bjorn > --- > net/qrtr/qrtr.c | 11 +++++++++-- > 1 file changed, 9 insertions(+), 2 deletions(-) > > diff --git a/net/qrtr/qrtr.c b/net/qrtr/qrtr.c > index e09154b..bd9bcea 100644 > --- a/net/qrtr/qrtr.c > +++ b/net/qrtr/qrtr.c > @@ -400,12 +400,13 @@ static void qrtr_node_assign(struct qrtr_node *node, unsigned int nid) > { > unsigned long flags; > > - if (node->nid != QRTR_EP_NID_AUTO || nid == QRTR_EP_NID_AUTO) > + if (nid == QRTR_EP_NID_AUTO) > return; > > spin_lock_irqsave(&qrtr_nodes_lock, flags); > radix_tree_insert(&qrtr_nodes, nid, node); > - node->nid = nid; > + if (node->nid == QRTR_EP_NID_AUTO) > + node->nid = nid; > spin_unlock_irqrestore(&qrtr_nodes_lock, flags); > } > > @@ -493,6 +494,12 @@ int qrtr_endpoint_post(struct qrtr_endpoint *ep, const void *data, size_t len) > > qrtr_node_assign(node, cb->src_node); > > + if (cb->type == QRTR_TYPE_NEW_SERVER) { > + /* Remote node endpoint can bridge other distant nodes */ > + const struct qrtr_ctrl_pkt *pkt = data + hdrlen; > + qrtr_node_assign(node, le32_to_cpu(pkt->server.node)); > + } > + > if (cb->type == QRTR_TYPE_RESUME_TX) { > qrtr_tx_resume(node, skb); > } else { > -- > 2.7.4 >
On Tue, 29 Sep 2020 15:33:17 +0200 Loic Poulain wrote: > + if (cb->type == QRTR_TYPE_NEW_SERVER) { > + /* Remote node endpoint can bridge other distant nodes */ > + const struct qrtr_ctrl_pkt *pkt = data + hdrlen; > + qrtr_node_assign(node, le32_to_cpu(pkt->server.node)); checkpatch says: WARNING: Missing a blank line after declarations #47: FILE: net/qrtr/qrtr.c:501: + const struct qrtr_ctrl_pkt *pkt = data + hdrlen; + qrtr_node_assign(node, le32_to_cpu(pkt->server.node));
diff --git a/net/qrtr/qrtr.c b/net/qrtr/qrtr.c index e09154b..bd9bcea 100644 --- a/net/qrtr/qrtr.c +++ b/net/qrtr/qrtr.c @@ -400,12 +400,13 @@ static void qrtr_node_assign(struct qrtr_node *node, unsigned int nid) { unsigned long flags; - if (node->nid != QRTR_EP_NID_AUTO || nid == QRTR_EP_NID_AUTO) + if (nid == QRTR_EP_NID_AUTO) return; spin_lock_irqsave(&qrtr_nodes_lock, flags); radix_tree_insert(&qrtr_nodes, nid, node); - node->nid = nid; + if (node->nid == QRTR_EP_NID_AUTO) + node->nid = nid; spin_unlock_irqrestore(&qrtr_nodes_lock, flags); } @@ -493,6 +494,12 @@ int qrtr_endpoint_post(struct qrtr_endpoint *ep, const void *data, size_t len) qrtr_node_assign(node, cb->src_node); + if (cb->type == QRTR_TYPE_NEW_SERVER) { + /* Remote node endpoint can bridge other distant nodes */ + const struct qrtr_ctrl_pkt *pkt = data + hdrlen; + qrtr_node_assign(node, le32_to_cpu(pkt->server.node)); + } + if (cb->type == QRTR_TYPE_RESUME_TX) { qrtr_tx_resume(node, skb); } else {
In order to reach non-immediate remote node services that are accessed through an intermediate node, the route to the remote node needs to be saved. E.g for a [node1 <=> node2 <=> node3] network - node2 forwards node3 service to node1 - node1 must save node2 as route for reaching node3 Signed-off-by: Loic Poulain <loic.poulain@linaro.org> --- net/qrtr/qrtr.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)