Skip to content

Option to force a different address, return ERROR if required change failed #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nirgal wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Option to force a different address, return ERROR if required change failed #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ad866c
Added option to force a different mac address
nirgal Jul 11, 2014
5e251be
Exit with an error if required change failed
nirgal Jul 11, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions doc/macchanger.texi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,13 @@ Change the MAC address setting a random vendor MAC of any kind.
@cindex @code{--random}
Set fully random MAC address: Any kind and any vendor.

@item -d
@cindex @code{-d}
@itemx --different
@cindex @code{--different}
Make sure the random MAC address is different from last one. That option must
be used with either -e, -a, -A, or -r.

@item -p
@cindex @code{-p}
@itemx --permanent
Expand Down
4 changes: 4 additions & 0 deletions macchanger.1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ Set random vendor MAC of any kind.
.B \-r, \-\-random
Set fully random MAC.
.TP
.B \-d, \-\-different
Make sure the random MAC address is different from last one. That option must
be used with either \-e, \-a, \-A, or \-r.
.TP
.B \-p, \-\-permanent
Reset MAC address to its original, permanent hardware value.
.TP
Expand Down
58 changes: 39 additions & 19 deletions src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ print_help (void)
" -r, --random Set fully random MAC\n"
" -l, --list[=keyword] Print known vendors\n"
" -b, --bia Pretend to be a burned-in-address\n"
" -m, --mac=XX:XX:XX:XX:XX:XX Set the MAC XX:XX:XX:XX:XX:XX\n\n"
" -m, --mac=XX:XX:XX:XX:XX:XX Set the MAC XX:XX:XX:XX:XX:XX\n"
" -d, --different Make sure the random MAC address is different\n\n"
"Report bugs to https://github.com/alobbs/macchanger/issues\n");
}

Expand Down Expand Up @@ -120,6 +121,7 @@ main (int argc, char *argv[])
char print_list = 0;
char show = 0;
char set_bia = 0;
char different = 0;
char *set_mac = NULL;
char *search_word = NULL;

Expand All @@ -135,6 +137,7 @@ main (int argc, char *argv[])
{"show", no_argument, NULL, 's'},
{"another_any", no_argument, NULL, 'A'},
{"bia", no_argument, NULL, 'b'},
{"different", no_argument, NULL, 'd'},
{"list", optional_argument, NULL, 'l'},
{"mac", required_argument, NULL, 'm'},
{NULL, 0, NULL, 0}
Expand All @@ -149,7 +152,7 @@ main (int argc, char *argv[])
int ret;

/* Read the parameters */
while ((val = getopt_long (argc, argv, "VasAbrephlm:", long_options, NULL)) != -1) {
while ((val = getopt_long (argc, argv, "VasAbrepdhlm:", long_options, NULL)) != -1) {
switch (val) {
case 'V':
printf ("GNU MAC changer %s\n"
Expand Down Expand Up @@ -185,6 +188,9 @@ main (int argc, char *argv[])
case 'p':
permanent = 1;
break;
case 'd':
different = 1;
break;
case 'm':
set_mac = optarg;
break;
Expand Down Expand Up @@ -244,36 +250,50 @@ main (int argc, char *argv[])
exit (EXIT_ERROR);
}
} else if (random) {
mc_mac_random (mac_faked, 6, set_bia);
do
mc_mac_random (mac_faked, 6, set_bia);
while (different && mc_mac_equal (mac, mac_faked));
} else if (ending) {
mc_mac_random (mac_faked, 3, 1);
do
mc_mac_random (mac_faked, 3, 1);
while (different && mc_mac_equal (mac, mac_faked));
} else if (another_same) {
val = mc_maclist_is_wireless (mac);
mc_maclist_set_random_vendor (mac_faked, val);
mc_mac_random (mac_faked, 3, 1);
do
mc_mac_random (mac_faked, 3, 1);
while (different && mc_mac_equal (mac, mac_faked));
} else if (another_any) {
mc_maclist_set_random_vendor(mac_faked, mac_is_anykind);
mc_mac_random (mac_faked, 3, 1);
do
mc_mac_random (mac_faked, 3, 1);
while (different && mc_mac_equal (mac, mac_faked));
} else if (permanent) {
mac_faked = mc_mac_dup (mac_permanent);
} else {
exit (EXIT_OK); /* default to show */
}

/* Set the new MAC */
ret = mc_net_info_set_mac (net, mac_faked);
if (ret == 0) {
/* Re-read the MAC */
mc_mac_free (mac_faked);
mac_faked = mc_net_info_get_mac(net);

/* Print it */
print_mac ("New MAC: ", mac_faked);

/* Is the same MAC? */
if (mc_mac_equal (mac, mac_faked)) {
printf ("It's the same MAC!!\n");
if (!mc_mac_equal (mac, mac_faked)) {
/* Set the new MAC */
ret = mc_net_info_set_mac (net, mac_faked);
if (ret == 0) {
/* Re-read the MAC */
mc_mac_free (mac_faked);
mac_faked = mc_net_info_get_mac(net);

/* Print it */
print_mac ("New MAC: ", mac_faked);

/* Is the same MAC? */
if (mc_mac_equal (mac, mac_faked)) {
printf ("It's the same MAC!!\n");
exit (EXIT_ERROR);
}
}
} else {
// No change required
ret = 0;
}

/* Memory free */
Expand Down