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

Able to customize gateway #221

Merged
merged 14 commits into from
Dec 26, 2021
Merged

Able to customize gateway #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
31f9b44
Add gateway to read_config
lakinduakash Dec 26, 2021
99e4f06
Add function to validate ip address
lakinduakash Dec 26, 2021
0ee5241
Update util.h header
lakinduakash Dec 26, 2021
d1015ed
Add gateway option to UI
lakinduakash Dec 26, 2021
c9d2016
Fix regeex for ip
lakinduakash Dec 26, 2021
53ea4b2
Add unit test
lakinduakash Dec 26, 2021
4a04356
Fix cb_gateway id
lakinduakash Dec 26, 2021
10805c1
Update default gateway in create_ap.conf template
lakinduakash Dec 26, 2021
d3eb78a
Implement gateway ip change in UI
lakinduakash Dec 26, 2021
43eb2ac
Change version
lakinduakash Dec 26, 2021
1ac53e4
Merge branch 'master' into dev
lakinduakash Dec 26, 2021
1fc80c4
Add make test to github actions
lakinduakash Dec 26, 2021
3f2379e
Merge branch 'dev' of https://github.com/lakinduakash/linux-wifi-hots…
lakinduakash Dec 26, 2021
3b163bc
Fix test Make
lakinduakash Dec 26, 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
1 change: 1 addition & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@ jobs:
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev libqrencode-dev libpng-dev build-essential gcc g++ pkg-config make
make test
make
sudo make install
8 changes: 7 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ install:
@echo "Installing..."
cd src && $(MAKE) install

test:
mkdir -p build
@echo "Testing..."
cd test && $(MAKE)

install-cli-only:
@echo "Installing command line interface only..."
cd src/scripts && $(MAKE) install-cli-only
Expand All @@ -19,7 +24,8 @@ uninstall:
clean-old:
cd src && $(MAKE) clean-old

.PHONY: clean
.PHONY: clean test

clean:
cd src && $(MAKE) clean
cd test && $(MAKE) clean
2 changes: 1 addition & 1 deletion debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
linux-wifi-hotspot (4.3.3) UNRELEASED; urgency=high
linux-wifi-hotspot (4.4.0) UNRELEASED; urgency=low

* Minor secrurty fixes

Expand Down
2 changes: 1 addition & 1 deletion src/scripts/create_ap.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CHANNEL=default
GATEWAY=10.0.0.1
GATEWAY=192.168.12.1
WPA_VERSION=2
ETC_HOSTS=0
DHCP_DNS=gateway
Expand Down
2 changes: 1 addition & 1 deletion src/ui/glade/about.glade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<property name="type_hint">dialog</property>
<property name="gravity">center</property>
<property name="program_name">Linux Wifi Hotspot</property>
<property name="version">4.3.3</property>
<property name="version">4.4.0</property>
<property name="copyright" translatable="yes">(c) lakinduakash 2021</property>
<property name="comments" translatable="yes">For more info visit
https://github.com/lakinduakash/linux-wifi-hotspot</property>
Expand Down
124 changes: 77 additions & 47 deletions src/ui/glade/wifih.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,29 +221,70 @@
<property name="row_spacing">10</property>
<property name="column_homogeneous">True</property>
<child>
<object class="GtkCheckButton" id="cb_hidden">
<property name="label" translatable="yes">Hidden</property>
<object class="GtkRadioButton" id="rb_freq_2">
<property name="label" translatable="yes">2.4Ghz</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
<property name="group">rb_freq_auto</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkRadioButton" id="rb_freq_auto">
<property name="label" translatable="yes">Auto</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
<property name="group">rb_freq_5</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Frequency band</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="cb_no_haveged">
<property name="label">No Haveged</property>
<object class="GtkRadioButton" id="rb_freq_5">
<property name="label" translatable="yes">5Ghz</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
<property name="group">rb_freq_auto</property>
</object>
<packing>
<property name="left_attach">3</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="cb_hidden">
<property name="label" translatable="yes">Hidden</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">9</property>
<property name="top_attach">1</property>
</packing>
</child>
<child>
Expand Down Expand Up @@ -322,57 +363,27 @@
</packing>
</child>
<child>
<object class="GtkRadioButton" id="rb_freq_2">
<property name="label" translatable="yes">2.4Ghz</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
<property name="group">rb_freq_auto</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkRadioButton" id="rb_freq_auto">
<property name="label" translatable="yes">Auto</property>
<object class="GtkCheckButton" id="cb_gateway">
<property name="label" translatable="yes">Gateway</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
<property name="group">rb_freq_5</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Frequency band</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="top_attach">6</property>
</packing>
</child>
<child>
<object class="GtkRadioButton" id="rb_freq_5">
<property name="label" translatable="yes">5Ghz</property>
<object class="GtkEntry" id="entry_gateway">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
<property name="group">rb_freq_auto</property>
<property name="halign">start</property>
</object>
<packing>
<property name="left_attach">3</property>
<property name="top_attach">0</property>
<property name="left_attach">1</property>
<property name="top_attach">6</property>
</packing>
</child>
<child>
Expand All @@ -385,7 +396,7 @@
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">6</property>
<property name="top_attach">7</property>
</packing>
</child>
<child>
Expand All @@ -398,7 +409,7 @@
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">6</property>
<property name="top_attach">7</property>
<property name="height">2</property>
</packing>
</child>
Expand All @@ -412,7 +423,7 @@
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">8</property>
<property name="top_attach">9</property>
</packing>
</child>
<child>
Expand All @@ -425,9 +436,28 @@
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">8</property>
<property name="top_attach">9</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="cb_no_haveged">
<property name="label">No Haveged</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">10</property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
Expand Down
9 changes: 7 additions & 2 deletions src/ui/h_prop.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,9 @@ const char *build_wh_start_command(char *iface_src, char *iface_dest, char *ssid

const char *build_wh_mkconfig_command(ConfigValues* cv){

const char* a=get_config_file(CONFIG_FILE_NAME);
const char* config_ffile_name=get_config_file(CONFIG_FILE_NAME);

snprintf(cmd_mkconfig, BUFSIZE, "%s %s %s %s '%s' '%s' %s %s",SUDO, CREATE_AP, cv->iface_wifi, cv->iface_inet, cv->ssid, cv->pass,MKCONFIG,a);
snprintf(cmd_mkconfig, BUFSIZE, "%s %s %s %s '%s' '%s' %s %s",SUDO, CREATE_AP, cv->iface_wifi, cv->iface_inet, cv->ssid, cv->pass,MKCONFIG,config_ffile_name);

if(cv->freq!=NULL){
strcat(cmd_mkconfig," --freq-band ");
Expand Down Expand Up @@ -141,6 +141,11 @@ const char *build_wh_mkconfig_command(ConfigValues* cv){
strcat(cmd_mkconfig, cv->mac);
}

if(cv->gateway!=NULL) {
strcat(cmd_mkconfig, " --gateway ");
strcat(cmd_mkconfig, cv->gateway);
}

if(cv->mac_filter!=NULL && (strcmp(cv->mac_filter,"1") == 0)){
strcat(cmd_mkconfig, " --mac-filter ");
strcat(cmd_mkconfig, cv->mac_filter);
Expand Down
3 changes: 3 additions & 0 deletions src/ui/read_config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,9 @@ static void setConfigValues(const char * key, char *value){

if( !strcmp ( IEEE80211AC, key ))
configValues.ieee80211ac = value;

if( !strcmp ( GATEWAY, key ))
configValues.gateway = value;

}

Expand Down
1 change: 1 addition & 0 deletions src/ui/read_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ typedef struct{
char *ieee80211n;
char *ieee80211ac;
char *no_haveged;
char *gateway;
} ConfigValues;


Expand Down
Loading