Skip to content
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

android: new domain name creation method #4176

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

android: new domain name creation method #4176

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7459780
android: new domain name creation method
truboxl Feb 10, 2021
2378fb0
android: allow override hostname in cc_config.xml too
truboxl Mar 5, 2021
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
20 changes: 18 additions & 2 deletions client/hostinfo_network.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@
#include <Carbon/Carbon.h>
#endif

#ifdef ANDROID
#include <sys/system_properties.h> // PROP_VALUE_MAX
#endif

#include "error_numbers.h"
#include "file_names.h"
#include "mac_address.h"
Expand All @@ -58,17 +62,29 @@
#include "hostinfo.h"

// get domain name and IP address of this host
// Android: if domain_name is empty, set it to android_xxxxxxxx
// Android: if domain_name is empty, set it to "brand model xxxxxxxx"
// else fallback to android_xxxxxxxx
//
int HOST_INFO::get_local_network_info() {
safe_strcpy(ip_addr, "");

#ifdef ANDROID
if (strlen(domain_name) && strcmp(domain_name, "localhost")) return 0;
char android_brand[PROP_VALUE_MAX];
char android_model[PROP_VALUE_MAX];
char buf[256];
make_random_string("", buf);
buf[8] = 0;
snprintf(domain_name, sizeof(domain_name), "android_%s", buf);
__system_property_get("ro.product.brand", android_brand);
__system_property_get("ro.product.model", android_model);
if (strlen(android_brand) && strlen(android_model)) {
snprintf(domain_name, sizeof(domain_name), "%s %s %s", android_brand, android_model, buf);
} else {
snprintf(domain_name, sizeof(domain_name), "android_%s", buf);
}
if (!cc_config.device_name.empty()) {
safe_strcpy(domain_name, cc_config.device_name.c_str());
}
return 0;
#endif

Expand Down