mirror of
https://github.com/albfan/miraclecast.git
synced 2025-03-09 23:38:56 +00:00
Make miracle-wifid conexists with other network tools
The new option --lazy-managed will let miracle-wifid don't managed the links automatically. Instead, the link will be managed only when the new DBus property Managed was set to true. So this will be possible that miracle-wifid could be conexists with other network tools like networkmanager. For example, unmange the device in networkmanager with setting the DBus property org.freedesktop.NetworkManager.Device.Managed to false and manage it in miracle-wifid with setting org.freedesktop.miracle.wifi.Link.Managed to true, then both them could works and don't need to kill each other. Besides, there is new command named make-managed in miracle-wifictl and miracle-sinkctla.
This commit is contained in:
parent
d239c528ff
commit
7d7df75bc9
9 changed files with 260 additions and 26 deletions
|
|
@ -51,19 +51,20 @@ static int cmd_list(char **args, unsigned int n)
|
|||
|
||||
/* list links */
|
||||
|
||||
cli_printf("%6s %-24s %-30s\n",
|
||||
"LINK", "INTERFACE", "FRIENDLY-NAME");
|
||||
cli_printf("%6s %-24s %-30s %-10s\n",
|
||||
"LINK", "INTERFACE", "FRIENDLY-NAME", "MANAGED");
|
||||
|
||||
shl_dlist_for_each(i, &wifi->links) {
|
||||
l = link_from_dlist(i);
|
||||
++link_cnt;
|
||||
|
||||
cli_printf("%6s %-24s %-30s\n",
|
||||
cli_printf("%6s %-24s %-30s %-10s\n",
|
||||
l->label,
|
||||
shl_isempty(l->ifname) ?
|
||||
"<unknown>" : l->ifname,
|
||||
shl_isempty(l->friendly_name) ?
|
||||
"<unknown>" : l->friendly_name);
|
||||
"<unknown>" : l->friendly_name,
|
||||
l->managed ? "yes": "no");
|
||||
}
|
||||
|
||||
cli_printf("\n");
|
||||
|
|
@ -156,6 +157,7 @@ static int cmd_show(char **args, unsigned int n)
|
|||
cli_printf("P2PScanning=%d\n", l->p2p_scanning);
|
||||
if (l->wfd_subelements && *l->wfd_subelements)
|
||||
cli_printf("WfdSubelements=%s\n", l->wfd_subelements);
|
||||
cli_printf("Managed=%d\n", l->managed);
|
||||
} else if (p) {
|
||||
cli_printf("Peer=%s\n", p->label);
|
||||
if (p->p2p_mac && *p->p2p_mac)
|
||||
|
|
@ -211,9 +213,51 @@ static int cmd_set_friendly_name(char **args, unsigned int n)
|
|||
return 0;
|
||||
}
|
||||
|
||||
if (!l->managed)
|
||||
return log_EUNMANAGED();
|
||||
|
||||
return ctl_link_set_friendly_name(l, name);
|
||||
}
|
||||
|
||||
/*
|
||||
* cmd: set-managed
|
||||
*/
|
||||
|
||||
static int cmd_set_managed(char **args, unsigned int n)
|
||||
{
|
||||
struct ctl_link *l = NULL;
|
||||
const char *value;
|
||||
bool managed = true;
|
||||
|
||||
if (n < 1) {
|
||||
cli_printf("To what?\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (n > 1) {
|
||||
l = ctl_wifi_search_link(wifi, args[0]);
|
||||
if (!l) {
|
||||
cli_error("unknown link %s", args[0]);
|
||||
return 0;
|
||||
}
|
||||
|
||||
value = args[1];
|
||||
} else {
|
||||
value = args[0];
|
||||
}
|
||||
|
||||
l = l ? : selected_link;
|
||||
if (!l) {
|
||||
cli_error("no link selected");
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (!strcmp(value, "no")) {
|
||||
managed = false;
|
||||
}
|
||||
return ctl_link_set_managed(l, managed);
|
||||
}
|
||||
|
||||
/*
|
||||
* cmd: p2p-scan
|
||||
*/
|
||||
|
|
@ -242,6 +286,9 @@ static int cmd_p2p_scan(char **args, unsigned int n)
|
|||
return 0;
|
||||
}
|
||||
|
||||
if (!l->managed)
|
||||
return log_EUNMANAGED();
|
||||
|
||||
return ctl_link_set_p2p_scanning(l, !stop);
|
||||
}
|
||||
|
||||
|
|
@ -289,6 +336,9 @@ static int cmd_connect(char **args, unsigned int n)
|
|||
pin = "";
|
||||
}
|
||||
|
||||
if (!p->l->managed)
|
||||
return log_EUNMANAGED();
|
||||
|
||||
return ctl_peer_connect(p, prov, pin);
|
||||
}
|
||||
|
||||
|
|
@ -311,6 +361,9 @@ static int cmd_disconnect(char **args, unsigned int n)
|
|||
return 0;
|
||||
}
|
||||
|
||||
if (!p->l->managed)
|
||||
return log_EUNMANAGED();
|
||||
|
||||
return ctl_peer_disconnect(p);
|
||||
}
|
||||
|
||||
|
|
@ -333,6 +386,7 @@ static const struct cli_cmd cli_cmds[] = {
|
|||
{ "select", "[link]", CLI_Y, CLI_LESS, 1, cmd_select, "Select default link" },
|
||||
{ "show", "[link|peer]", CLI_M, CLI_LESS, 1, cmd_show, "Show detailed object information" },
|
||||
{ "set-friendly-name", "[link] <name>", CLI_M, CLI_LESS, 2, cmd_set_friendly_name, "Set friendly name of an object" },
|
||||
{ "set-managed", "[link] <yes|no>", CLI_M, CLI_LESS, 2, cmd_set_managed, "Manage or unmnage a link" },
|
||||
{ "p2p-scan", "[link] [stop]", CLI_Y, CLI_LESS, 2, cmd_p2p_scan, "Control neighborhood P2P scanning" },
|
||||
{ "connect", "<peer> [provision] [pin]", CLI_M, CLI_LESS, 3, cmd_connect, "Connect to peer" },
|
||||
{ "disconnect", "<peer>", CLI_M, CLI_EQUAL, 1, cmd_disconnect, "Disconnect from peer" },
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue