[][MAC80211][app][Add bridge name config to atenl]
[Description]
Add bridge name config to atenl
Add dynamic default bridge name selection via detecting SDK
[Release-log]
N/A
Change-Id: I1611633a124ebb57499b8a286020c55c0d1c3080
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/6604202
Build: srv_hbgsm110
diff --git a/feed/atenl/src/atenl.h b/feed/atenl/src/atenl.h
index 42d9455..75ee474 100644
--- a/feed/atenl/src/atenl.h
+++ b/feed/atenl/src/atenl.h
@@ -17,7 +17,8 @@
#include "util.h"
#include "debug.h"
-#define BRIDGE_NAME "br-lan"
+#define BRIDGE_NAME_OPENWRT "br-lan"
+#define BRIDGE_NAME_RDKB "brlan0"
#define ETH_P_RACFG 0x2880
#define RACFG_PKT_MAX_SIZE 1600
#define RACFG_HLEN 12
@@ -86,6 +87,7 @@
u8 cur_band;
u8 mac_addr[ETH_ALEN];
+ char *bridge_name;
bool unicast;
int sock_eth;
diff --git a/feed/atenl/src/eth.c b/feed/atenl/src/eth.c
index 54a8d2c..cd32f71 100644
--- a/feed/atenl/src/eth.c
+++ b/feed/atenl/src/eth.c
@@ -9,7 +9,12 @@
struct ifreq ifr = {};
int ret;
- memcpy(ifr.ifr_name, BRIDGE_NAME, strlen(BRIDGE_NAME));
+ if (!an->bridge_name) {
+ perror("Bridge name not specified");
+ goto out;
+ }
+
+ memcpy(ifr.ifr_name, an->bridge_name, strlen(an->bridge_name));
ret = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_RACFG));
if (ret < 0) {
perror("socket");
@@ -18,7 +23,7 @@
an->sock_eth = ret;
addr.sll_family = AF_PACKET;
- addr.sll_ifindex = if_nametoindex(BRIDGE_NAME);
+ addr.sll_ifindex = if_nametoindex(an->bridge_name);
ret = bind(an->sock_eth, (struct sockaddr *)&addr, sizeof(addr));
if (ret < 0) {
@@ -34,7 +39,7 @@
memcpy(an->mac_addr, ifr.ifr_hwaddr.sa_data, ETH_ALEN);
atenl_info("Open Ethernet socket success on %s, mac addr = " MACSTR "\n",
- BRIDGE_NAME, MAC2STR(an->mac_addr));
+ an->bridge_name, MAC2STR(an->mac_addr));
ret = 0;
out:
@@ -95,7 +100,7 @@
addr.sll_family = PF_PACKET;
addr.sll_protocol = htons(ETH_P_RACFG);
- addr.sll_ifindex = if_nametoindex(BRIDGE_NAME);
+ addr.sll_ifindex = if_nametoindex(an->bridge_name);
addr.sll_pkttype = PACKET_BROADCAST;
addr.sll_hatype = ARPHRD_ETHER;
addr.sll_halen = ETH_ALEN;
diff --git a/feed/atenl/src/main.c b/feed/atenl/src/main.c
index 9667da3..d6526ac 100644
--- a/feed/atenl/src/main.c
+++ b/feed/atenl/src/main.c
@@ -56,6 +56,30 @@
return atoi(buf);
}
+static int get_default_bridge_name(struct atenl *an)
+{
+ char buf[128];
+ FILE *f;
+ size_t len;
+ int ret;
+
+ ret = snprintf(buf, sizeof(buf), "/sbin/procd");
+ if (snprintf_error(sizeof(buf), ret))
+ return -1;
+
+ f = fopen(buf, "r");
+
+ /* This procd is openwrt only */
+ if (f) {
+ an->bridge_name = BRIDGE_NAME_OPENWRT;
+ fclose(f);
+ } else {
+ an->bridge_name = BRIDGE_NAME_RDKB;
+ }
+
+ return 0;
+}
+
static void usage(void)
{
printf("Usage:\n");
@@ -63,9 +87,10 @@
printf("options:\n"
" -h = show help text\n"
" -i = phy name of driver interface, please use first phy for dbdc\n"
- " -u = use unicast to respond to HQADLL\n");
+ " -u = use unicast to respond to HQADLL\n"
+ " -b = specify your bridge name\n");
printf("examples:\n"
- " %s -u -i phy0\n", progname);
+ " %s -u -i phy0 -b br-lan\n", progname);
exit(EXIT_FAILURE);
}
@@ -109,7 +134,7 @@
return -ENOMEM;
while(1) {
- opt = getopt(argc, argv, "hi:uc:");
+ opt = getopt(argc, argv, "hi:uc:b:");
if (opt == -1)
break;
@@ -120,6 +145,9 @@
case 'i':
phy = optarg;
break;
+ case 'b':
+ an->bridge_name = optarg;
+ break;
case 'u':
an->unicast = true;
printf("Opt: use unicast to send response\n");
@@ -147,6 +175,18 @@
atenl_enable = true;
atenl_init_signals();
+ if (!an->bridge_name) {
+ ret = get_default_bridge_name(an);
+ if (ret) {
+ atenl_err("Get default bridge name failed\n");
+ goto out;
+ }
+
+ atenl_info("Bridge name is not specified, use default bridge name: %s\n", an->bridge_name);
+ } else {
+ atenl_info("Currently using bridge name: %s\n", an->bridge_name);
+ }
+
/* background ourself */
if (!fork()) {
ret = atenl_eeprom_init(an, phy_idx);