Skip to content

update submodule mtproxy #2

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
ifurther wants to merge 11 commits into
base: master
Choose a base branch
from
Open

update submodule mtproxy #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f249638
update submodule mtproxy
ifurther Feb 28, 2021
1942908
change expose port
ifurther Feb 28, 2021
0d77254
add env
ifurther Feb 28, 2021
7aadf6d
fix string error
ifurther Feb 28, 2021
bcc44fb
fix $
ifurther Feb 28, 2021
8c2d503
remove "
ifurther Feb 28, 2021
c57aee1
remove space
ifurther Feb 28, 2021
3197d5f
check
ifurther Feb 28, 2021
0d47f8c
combine
ifurther Feb 28, 2021
e4f1480
test ''
ifurther Feb 28, 2021
4dcc740
change port setting
ifurther Feb 28, 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 .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
config/*
9 changes: 5 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ FROM alpine:3.6
LABEL maintainer="Alex Doe <alex@doe.sh>" \
description="Telegram Messenger MTProto zero-configuration proxy server."

ENV PORT=443

RUN apk add --no-cache curl \
&& ln -s /usr/lib/libcrypto.so.41 /usr/lib/libcrypto.so.1.0.0
# alpine:3.7 will need symlink to libcrypto.so.42
Expand All @@ -31,13 +33,12 @@ COPY --from=0 /mtproxy/sources/objs/bin/mtproto-proxy .
COPY docker-entrypoint.sh /

VOLUME /data
EXPOSE 2398 443
EXPOSE 2398
EXPOSE ${PORT}

ENTRYPOINT ["/docker-entrypoint.sh"]
CMD [ \

CMD [ \
"--port", "2398", \
"--http-ports", "443", \
"--slaves", "2", \
"--max-special-connections", "60000", \
"--allow-skip-dh" \
Expand Down
2 changes: 1 addition & 1 deletion MTProxy
Open in desktop
Submodule MTProxy updated 22 files
+11 −1 README.md
+11 −1 common/sha256.c
+2 −0 common/sha256.h
+11 −106 crypto/aesni256.c
+5 −27 crypto/aesni256.h
+1 −2 engine/engine-net.c
+1 −1 engine/engine.c
+85 −23 mtproto/mtproto-proxy.c
+55 −56 net/net-connections.c
+43 −23 net/net-connections.h
+10 −14 net/net-crypto-aes.c
+2 −6 net/net-crypto-aes.h
+1 −1 net/net-crypto-dh.c
+12 −12 net/net-events.c
+7 −15 net/net-msg.c
+1 −3 net/net-msg.h
+47 −10 net/net-tcp-connections.c
+15 −1 net/net-tcp-rpc-common.c
+10 −9 net/net-tcp-rpc-common.h
+1,138 −34 net/net-tcp-rpc-ext-server.c
+5 −1 net/net-tcp-rpc-ext-server.h
+0 −3 net/net-tcp-rpc-server.c
2 changes: 1 addition & 1 deletion docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,4 +112,4 @@ echo '[+] Starting proxy...'
sleep 1

# exec /mtproxy/mtproto-proxy -p 2398 -H 443 -M "$WORKERS" -C 60000 --aes-pwd /etc/telegram/hello-explorers-how-are-you-doing -u root $CONFIG --allow-skip-dh --nat-info "$INTERNAL_IP:$IP" $SECRET_CMD $TAG_CMD
exec /mtproxy/mtproto-proxy "$@" --aes-pwd ${REMOTE_SECRET} --user root ${REMOTE_CONFIG} --nat-info "$INTERNAL_IP:$EXTERNAL_IP" ${SECRET_CMD} ${TAG_CMD}
exec /mtproxy/mtproto-proxy "$@" --http-ports ${PORT} --aes-pwd ${REMOTE_SECRET} --user root ${REMOTE_CONFIG} --nat-info "$INTERNAL_IP:$EXTERNAL_IP" ${SECRET_CMD} ${TAG_CMD}