@@ -158,7 +158,8 @@ static int qrtr_bcast_enqueue(struct qrtr_node *node, struct sk_buff *skb,
static struct qrtr_sock *qrtr_port_lookup(int port);
static void qrtr_port_put(struct qrtr_sock *ipc);
-unsigned int get_qrtr_local_nid(void) {
+unsigned int get_qrtr_local_nid(void)
+{
return qrtr_local_nid;
}
@@ -91,10 +91,7 @@ struct qsr {
struct qsr_ops {
int (*new_server)(struct qsr_info *svc);
-
- int (*new_lookup)(struct qsr_info *svc,
- u32 node,
- u32 port);
+ int (*new_lookup)(struct qsr_info *svc, u32 node, u32 port);
};
static int qsr_major;
@@ -112,7 +109,7 @@ static int qsr_new_server(struct qsr_info *new)
list_for_each_entry(lookup, &qsr->lookups, list) {
if (lookup->service == new->service &&
- lookup->instance == new->instance) {
+ lookup->instance == new->instance) {
ret = ops->new_lookup(new,
lookup->client.node,
lookup->client.port);
@@ -127,9 +124,7 @@ static int qsr_new_server(struct qsr_info *new)
return 0;
}
-static int qsr_new_lookup(struct qsr_info *svc,
- u32 node,
- u32 port)
+static int qsr_new_lookup(struct qsr_info *svc, u32 node, u32 port)
{
struct qrtr_ctrl_pkt pkt;
struct sockaddr_qrtr sq;
@@ -180,7 +175,7 @@ static void qsr_recv_new_server(u32 service,
list_for_each_entry(temp, &qsr->services, list) {
if (temp->service == service && temp->instance == instance) {
pr_err("Error server exists, service:0x%x instance:0x%x",
- service, instance);
+ service, instance);
return;
}
}
@@ -230,9 +225,9 @@ static void qsr_recv_new_lookup(u32 service,
list_for_each_entry(temp, &qsr->lookups, list) {
if (temp->service == service &&
- temp->instance == instance &&
- temp->client.node == node &&
- temp->client.port == port) {
+ temp->instance == instance &&
+ temp->client.node == node &&
+ temp->client.port == port) {
pr_err("Error lookup exists, service:0x%x instance:0x%x node:%d port:%d",
service, instance, node, port);
return;
@@ -299,28 +294,28 @@ static void qsr_recv_ctrl_pkt(struct sockaddr_qrtr *sq,
switch (le32_to_cpu(pkt->cmd)) {
case QRTR_TYPE_NEW_SERVER:
qsr_recv_new_server(le32_to_cpu(pkt->server.service),
- le32_to_cpu(pkt->server.instance),
+ le32_to_cpu(pkt->server.instance),
le32_to_cpu(pkt->server.node),
le32_to_cpu(pkt->server.port));
break;
case QRTR_TYPE_NEW_LOOKUP:
qsr_recv_new_lookup(le32_to_cpu(pkt->server.service),
- le32_to_cpu(pkt->server.instance),
- sq->sq_node,
- sq->sq_port);
+ le32_to_cpu(pkt->server.instance),
+ sq->sq_node,
+ sq->sq_port);
break;
case QRTR_TYPE_DEL_SERVER:
qsr_recv_del_server(le32_to_cpu(pkt->server.service),
- le32_to_cpu(pkt->server.instance));
+ le32_to_cpu(pkt->server.instance));
break;
case QRTR_TYPE_DEL_LOOKUP:
qsr_recv_del_lookup(le32_to_cpu(pkt->server.service),
- le32_to_cpu(pkt->server.instance),
- sq->sq_node,
- sq->sq_port);
+ le32_to_cpu(pkt->server.instance),
+ sq->sq_node,
+ sq->sq_port);
break;
}
}
@@ -386,8 +381,10 @@ static ssize_t lookups_show(struct device *dev,
mutex_lock(&qsr->qsr_lock);
list_for_each_entry(lookup, &qsr->lookups, list) {
ret += sprintf(buf, "service:0x%04x instance:0x%04x node:%04d port:%04d\n",
- lookup->service, lookup->instance,
- lookup->server.node, lookup->server.port);
+ lookup->service,
+ lookup->instance,
+ lookup->server.node,
+ lookup->server.port);
}
mutex_unlock(&qsr->qsr_lock);
@@ -404,8 +401,10 @@ static ssize_t services_show(struct device *dev,
mutex_lock(&qsr->qsr_lock);
list_for_each_entry(svc, &qsr->services, list) {
ret += sprintf(buf, "service:0x%04x instance:0x%04x node:%04d port:%04d\n",
- svc->service, svc->instance,
- svc->server.node, svc->server.port);
+ svc->service,
+ svc->instance,
+ svc->server.node,
+ svc->server.port);
}
mutex_unlock(&qsr->qsr_lock);
QSR implements maintenance of qrtr services and lookups. It would be helpful for developers to work with QRTR without the none-opensource user-space implementation part of IPC Router. As we know, the extremely important point of IPC Router is the support of services form different nodes. But QRTR was pushed into mainline without route process support of services, and the router port process is implemented in user-space as none-opensource codes, which is an great unconvenience for developers. QSR also implements a interface via chardev and a set of sysfs class files for the communication and debugging in user-space. We can get service and lookup entries conveniently via sysfs file in /sys/class/qsr/. Currently add-server, del-server, add-lookup and del-lookup control packatets are processed and enhancements could be taken easily upon currently implementation. Signed-off-by: Wang Wenhu <wenhu.wang@vivo.com> --- net/qrtr/qrtr.c | 3 ++- net/qrtr/qsr.c | 47 +++++++++++++++++++++++------------------------ 2 files changed, 25 insertions(+), 25 deletions(-)