Variable TCP Telnet ports via web interface #205

fuzzball03 · 2016-10-27T21:58:46Z

Per issue #167 ... Here ya go, first attempt, untested.
Spent an hour or so at work on this today...

I've only done really simple C coding, this will be my first that consists of multiple headers.
Please be easy on me - CONSTRUCTIVE CRITICISM WELCOME.

Note - this is untested.

Updates for changing/selecting telnet ports

Fixed formatting/extra space

Updates for changing/selecting telnet ports. Fixed formatting.

Moved new variable at bottom as requested in this header comments.

Updates for changing/selecting telnet ports

Todo: Missing function for init in serbridge?

Updates for changing/selecting telnet ports -Add function to reinit serbridge after change Telnet ports.

Updates for changing/selecting telnet ports

Make sure we use our custom telnet ports at bootup

Fixed bad variable reference

Fix implicit function call.

Remove unecssary function

Fixed a stupid typo in a function name.

Changed function for unsigned integers.

fuzzball03 · 2016-10-27T22:30:51Z

Build failed... but I cannot determine why.

esp-link/config.c:39:3: error: large integer implicitly truncated to unsigned type [-Werror=overflow]
.telnet_port2 = 2323,
^

unsigned integer, 8 bits should hold a max of 65535 - perfect for setting a TCP port, or so it would seem.

Do I need to change this to a uint16_t?

Thanks for the input/help.

Changed flashconfig.telnet_port to unsigned 16bit integer.

Changed functions for unsigned 16bit integer.

tve

Looking promising! :-)

tve · 2016-10-28T06:47:45Z

esp-link/cgitelnet.c

+  }
+
+  int8_t ok = 0;
+  uint8_t port1, port2;


ports are 16 bits: 0..65535

Of course! I got the thought of a short int = 8bit stuck in my head yesterday.
Once I realized that... unsigned 16bit should get me there.

tve · 2016-10-28T06:49:23Z

esp-link/cgitelnet.c

+  uint8_t port1, port2;
+  ok |= getUInt16Arg(connData, "port1", &port1);
+  ok |= getUInt16Arg(connData, "port2", &port2);
+  if (ok < 0) return HTTPD_CGI_DONE;


You can't just return here, you have to send some HTTP response back. A 304 not modified or a 200 OK would be reasonable choices.

Ill modify it to include the responses.

tve · 2016-10-28T06:51:18Z

esp-link/cgitelnet.c

+  }
+  return HTTPD_CGI_DONE;
+
+collision: {


Please put this inline since there is only one "goto" to here.

tve · 2016-10-28T06:52:39Z

esp-link/cgitelnet.c

+
+    // apply the changes
+    //serbridgeReinit();
+    serbridgeInit(flashConfig.telnet_port1, flashConfig.telnet_port2);


Please apply change after saving otherwise you might apply the changes, fail to save and return an error, but then things are inconsistent.

tve · 2016-10-28T06:53:32Z

esp-link/cgitelnet.h

+#include "httpd.h"
+
+int cgiTelnet(HttpdConnData *connData);
+// int8_t telnet_port1, telnet_port2;


you can delete this comment...

tve · 2016-10-28T06:56:07Z

esp-link/main.c

@@ -96,6 +97,8 @@ HttpdBuiltInUrl builtInUrls[] = {
  { "/services/info", cgiServicesInfo, NULL },
  { "/services/update", cgiServicesSet, NULL },
  { "/pins", cgiPins, NULL },
+  { "/telnet/info", cgiTelnet, NULL},
+  { "/telnet/update", cgiTelnet, NULL},


You only need one since you distinguish using GET and POST. Not sure why there are two for services, something for me to check.

Yea, I picked up on this. However I wanted to attempt to avoid someone making an easy mistake of sending a PUT request via '/telnet' & accidently modifying it.
However, ill be happy to merge it to just one.
Also, ill have to modify the Ajax method for making inputs since it makes a call to /update

Services uses two because this & pins cgi use a single method to call back set or get. They determine which to use based on the header received(or GET or PUT)

tve · 2016-10-28T06:58:43Z

serial/serbridge.c

@@ -469,6 +469,8 @@ serbridgeInitPins()
 }

 // Start transparent serial bridge TCP server on specified port (typ. 23)
+// Here is where we need to change the ports. But how do we do this from the Ajax call?
+


Delete left-over comment? You have that here https://github.com/jeelabs/esp-link/pull/205/files#diff-b6cc56038011d1226a2ee85cb280b897R47

Yup, old comment. Left it for me to find while working on this.

tve · 2016-10-28T07:02:15Z

esp-link/cgitelnet.c

+  if (ok < 0) return HTTPD_CGI_DONE;
+
+  char *coll;
+  if (ok > 0) {


I heaven't dealt with the ajax stuff in a while and forgotten everything (oops), but I think you're gonna get one port at a time when you fill out one input field and hit enter.

I think you're right. Ill modify to have it check the flashconfig variables.

Corrected several mistakes (16 vs 8bit int) Check to see which variable we are modifying & fill the other one from flag so we can make sure they do NOT conflict. Added return error http header using existing collision goto.

Remove unecessary comments

Changes made so we can use a single namespace "/telnet" vs two. Somewhat dirty fix inserted into existing ajax function.

Place variable declartion in correct place.

dannybackx · 2016-11-01T16:40:08Z

Haven't done extensive tests yet but after the "change call to 0/1 instead of 1/2" commit, it appears to work.

Should make code more fluid & inuitive. All code changes made to reflect javascrupt, html, and C.

fuzzball03 · 2016-11-03T07:15:52Z

This should be ready to test again.
Please let me know if any issues.

Try the build from here:
https://github.com/fuzzball03/esp-link/releases/tag/untagged-e4362599141176c301e5

fuzzball03 · 2016-11-03T07:19:22Z

Makefile

@@ -52,12 +52,15 @@ ESP_HOSTNAME  ?= esp-link
 # Base directory for the compiler. Needs a / at the end.
 # Typically you'll install https://github.com/pfalcon/esp-open-sdk
 # IMPORTANT: use esp-open-sdk `make STANDALONE=n`: the SDK bundled with esp-open-sdk will *not* work!
-XTENSA_TOOLS_ROOT ?= $(abspath ../esp-open-sdk/xtensa-lx106-elf/bin)/
+XTENSA_TOOLS_ROOT ?= $(abspath ../espressif/xtensa-lx106-elf/bin)/
+$(warning Using XTENSA TOOLS from $(XTENSA_TOOLS_ROOT))



Please look at this commit for a more thorough explanation of changes made in Makefile
fuzzball03@286e886

I may write a new javscript method all together for this... My goal might be to make one that is more adaptable to save on time & reduce overall size/complexity of code.

dannybackx · 2016-11-08T06:05:50Z

FYI I am continuing work, based on your code. My changes aren't stable enough to commit yet.

fuzzball03 · 2016-11-09T00:09:06Z

Same here. I've done some pretty extensive changes to the HTML and
JavaScript. I'll probably commit it to a separate Branch so you can go
ahead and take a look, however it's far from ready

On Tue, Nov 8, 2016, 12:05 AM dannybackx notifications@github.com wrote:

FYI I am continuing work, based on your code. My changes aren't stable
enough to commit yet.

—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
#205 (comment), or mute
the thread
https://github.com/notifications/unsubscribe-auth/AFimNCO4BoNji18y0JXoKuk3lnSzsTeZks5q8BFFgaJpZM4Ki3uL
.

fuzzball03 · 2016-11-09T07:51:29Z

@dannybackx
Incase you missed it, here's that other branch where I've been doing most of the HTML work.
https://github.com/fuzzball03/esp-link/tree/testing

The code works, though it still needs some serious cleanup.
The password fields do not really do anything on the back end(C code) at this time, but I assumed it'd be easier to let you handle those details.

dannybackx · 2016-11-09T16:33:06Z

Thanks, I didn't find this yet.
Yes, I'll do the C coding.

dannybackx · 2016-11-10T04:21:37Z

The new UI for changing the ports looks great in this version, but the menu bar at the left won't work. Do you see the same ? Also many of the areas keep showing the spinning circle.

tve · 2017-06-16T03:59:31Z

What is the status of this PR? It doesn't look like it's ready to be merged and some of the changes have been implemented in other PRs? There are lots of changes to travis and Makefile here that make me rather uncomfortable. Should this be closed and a more focused PR opened if there is interest?

egyegy · 2018-05-03T16:32:53Z

Hello, I'm also interested if the Ip and port can be changed from the browser interface.

thank you!

ayasystems · 2019-03-05T18:51:21Z

Any body can send me the binary with the tcp port option? It is a great feature.

uzi18 · 2019-03-05T19:27:09Z

why you need different port?

ayasystems · 2019-04-19T09:15:36Z

why you need different port?

Some aplications has other port

For example OBD2 APP

uzi18 · 2019-04-19T16:49:55Z

you can redirect it on localhost

fuzzball03 added 15 commits October 27, 2016 15:24

Update home.html

563957f

Updates for changing/selecting telnet ports

Update ui.js

143eb24

Updates for changing/selecting telnet ports

Update cgipins.c

eb7fde7

Fixed formatting/extra space

Update config.h

5cb0350

Updates for changing/selecting telnet ports. Fixed formatting.

Update config.h

fb1bbd3

Moved new variable at bottom as requested in this header comments.

Update config.c

93ca100

Updates for changing/selecting telnet ports

Create cgitelnet.h

02197a9

Updates for changing/selecting telnet ports

Update cgitelnet.h

8919ff6

Create cgitelnet.c

f315385

Todo: Missing function for init in serbridge?

Update serbridge.c

59edf88

Updates for changing/selecting telnet ports -Add function to reinit serbridge after change Telnet ports.

Update serbridge.c

6054496

Update main.c

a230f42

Updates for changing/selecting telnet ports

Update main.c

4bddea7

Update main.c

04bbccb

Update main.c

936951d

Make sure we use our custom telnet ports at bootup

fuzzball03 mentioned this pull request Oct 27, 2016

Variable TCP PORT #167

Open

fuzzball03 added 5 commits October 27, 2016 17:04

Update cgitelnet.c

0009d8f

Fixed bad variable reference

Update cgitelnet.c

bead65f

Fix implicit function call.

Update serbridge.c

c3a3b06

Remove unecssary function

Update cgitelnet.c

67a05de

Fixed a stupid typo in a function name.

Update cgitelnet.c

1cf190a

Changed function for unsigned integers.

fuzzball03 added 2 commits October 27, 2016 17:32

Update config.h

6fb97bd

Changed flashconfig.telnet_port to unsigned 16bit integer.

Update cgitelnet.c

a01db32

Changed functions for unsigned 16bit integer.

tve requested changes Oct 28, 2016

View reviewed changes

fuzzball03 added 5 commits October 28, 2016 10:07

Cgitelnet changes/fixes

157569e

Corrected several mistakes (16 vs 8bit int) Check to see which variable we are modifying & fill the other one from flag so we can make sure they do NOT conflict. Added return error http header using existing collision goto.

Cleanup

fe95b4b

Remove unecessary comments

Ajax/Html changes

ffd13c6

Changes made so we can use a single namespace "/telnet" vs two. Somewhat dirty fix inserted into existing ajax function.

Cgitelnet update

3cb3804

Place variable declartion in correct place.

Update cgitelnet.c

a9f583e

Change call to 0/1 instead of 1/2

f3060e6

fuzzball03 added 4 commits November 3, 2016 01:49

Makefile/Build file changes

286e886

Formatting cleanup

6596883

Modify all calls to port variables to match. Espconn1 = TelnetPort1

0b8368a

Should make code more fluid & inuitive. All code changes made to reflect javascrupt, html, and C.

Fix error for sucessful Travis build

b8404a1

fuzzball03 commented Nov 3, 2016

View reviewed changes

fuzzball03 added 4 commits November 4, 2016 11:38

Start making changes for Danny's security settings

bda82de

fix error

623f7b4

Fix errors

5e346a3

HTML Changes.

b5243b0

I may write a new javscript method all together for this... My goal might be to make one that is more adaptable to save on time & reduce overall size/complexity of code.

fuzzball03 added 6 commits November 16, 2016 08:14

Update .travis.yml

6fd5938

Update .travis.yml

25feca5

5

23a904f

9

1df972b

10

153f470

12

9fcee90

itSsli approved these changes Nov 12, 2020

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Variable TCP Telnet ports via web interface #205

Variable TCP Telnet ports via web interface #205

fuzzball03 commented Oct 27, 2016

fuzzball03 commented Oct 27, 2016

tve left a comment

tve Oct 28, 2016

fuzzball03 Oct 28, 2016

tve Oct 28, 2016

fuzzball03 Oct 28, 2016

tve Oct 28, 2016

tve Oct 28, 2016

fuzzball03 Oct 28, 2016

tve Oct 28, 2016

fuzzball03 Oct 28, 2016

tve Oct 28, 2016

fuzzball03 Oct 28, 2016 •

edited

tve Oct 28, 2016

fuzzball03 Oct 28, 2016

tve Oct 28, 2016

fuzzball03 Oct 28, 2016

dannybackx commented Nov 1, 2016

fuzzball03 commented Nov 3, 2016

fuzzball03 Nov 3, 2016

dannybackx commented Nov 8, 2016

fuzzball03 commented Nov 9, 2016

fuzzball03 commented Nov 9, 2016

dannybackx commented Nov 9, 2016

dannybackx commented Nov 10, 2016

tve commented Jun 16, 2017

egyegy commented May 3, 2018 •

edited

ayasystems commented Mar 5, 2019

uzi18 commented Mar 5, 2019

ayasystems commented Apr 19, 2019

uzi18 commented Apr 19, 2019

Variable TCP Telnet ports via web interface #205

Are you sure you want to change the base?

Variable TCP Telnet ports via web interface #205

Conversation

fuzzball03 commented Oct 27, 2016

fuzzball03 commented Oct 27, 2016

tve left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fuzzball03 Oct 28, 2016 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dannybackx commented Nov 1, 2016

fuzzball03 commented Nov 3, 2016

Choose a reason for hiding this comment

dannybackx commented Nov 8, 2016

fuzzball03 commented Nov 9, 2016

fuzzball03 commented Nov 9, 2016

dannybackx commented Nov 9, 2016

dannybackx commented Nov 10, 2016

tve commented Jun 16, 2017

egyegy commented May 3, 2018 • edited

ayasystems commented Mar 5, 2019

uzi18 commented Mar 5, 2019

ayasystems commented Apr 19, 2019

uzi18 commented Apr 19, 2019

fuzzball03 Oct 28, 2016 •

edited

egyegy commented May 3, 2018 •

edited