Skip to content

Updare #106

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

Updare #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3ad1bc5
disable redudp for shadowsocks-android
madeye Nov 7, 2015
88cda9a
add version
madeye Nov 7, 2015
65d039c
refine redsocks
madeye Nov 11, 2015
32d5df0
WAR for some AOSP
madeye Nov 15, 2015
930896d
Revert "WAR for some AOSP"
madeye Nov 15, 2015
76348e9
disable dnstc module of redsocks
madeye Nov 15, 2015
3bc3f03
disable log for Android
madeye Nov 21, 2015
274334f
Use standard __ANDROID__ preprocessor macro (#1)
Mygod May 17, 2017
d995489
Merge tag 'release-0.5' into shadowsocks-android
Mygod Mar 29, 2019
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
2 changes: 2 additions & 0 deletions log.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,9 @@ static void fprint_timestamp(

static void stderr_msg(const char *file, int line, const char *func, int priority, const char *message, const char *appendix)
{
#ifndef __ANDROID__
fprint_timestamp(stderr, file, line, func, priority, message, appendix);
#endif
}

static FILE *logfile = NULL;
Expand Down
4 changes: 4 additions & 0 deletions main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,21 @@
extern app_subsys redsocks_subsys;
extern app_subsys debug_subsys;
extern app_subsys base_subsys;
#ifndef __ANDROID__
extern app_subsys redudp_subsys;
extern app_subsys dnstc_subsys;
#endif

app_subsys *subsystems[] = {
&redsocks_subsys,
#ifdef DBG_BUILD
&debug_subsys,
#endif
&base_subsys,
#ifndef __ANDROID__
&redudp_subsys,
&dnstc_subsys,
#endif
};

static const char *confname = "redsocks.conf";
Expand Down
2 changes: 1 addition & 1 deletion redsocks.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1373,7 +1373,7 @@ static int redsocks_init_instance(redsocks_instance *instance)
int on = 1;
int fd = -1;

fd = socket(AF_INET, SOCK_STREAM, 0);
fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
if (fd == -1) {
log_errno(LOG_ERR, "socket");
goto fail;
Expand Down
2 changes: 1 addition & 1 deletion version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#ifndef VERSION_H_SUN_NOV_27_03_22_30_2011
#define VERSION_H_SUN_NOV_27_03_22_30_2011

extern const char* redsocks_version;
const char* redsocks_version = "SUN_NOV_27_03_22_30_2011";
Copy link

@semigodking semigodking Jun 19, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why this change?


#endif // VERSION_H_SUN_NOV_27_03_22_30_2011