diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-04-10 14:26:52 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-04-10 14:26:52 +0000 |
| commit | 20fadf45adddb27cf7e4db736614b67f7f8561f6 (patch) | |
| tree | a56895a381928b64eae04dad23d65aa657fa12a7 /src/char/char.c | |
| parent | 586060188338f7a09c700961520b7e35007f9b28 (diff) | |
| download | hercules-20fadf45adddb27cf7e4db736614b67f7f8561f6.tar.gz hercules-20fadf45adddb27cf7e4db736614b67f7f8561f6.tar.bz2 hercules-20fadf45adddb27cf7e4db736614b67f7f8561f6.tar.xz hercules-20fadf45adddb27cf7e4db736614b67f7f8561f6.zip | |
- Updated the subnet support to not require specifying the subnet mask, it is auto-acquired from the char/map IP and the subnet-mask.
- skill_wall_check defaults to yes now.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5976 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/char/char.c')
| -rw-r--r-- | src/char/char.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/char/char.c b/src/char/char.c index 8afd7c5af..3ca461610 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -3051,7 +3051,7 @@ int lan_subnetcheck(long *p) { for(i=0; i<subnet_count; i++) {
- if((subnet[i].subnet & subnet[i].mask) == (*p & subnet[i].mask)) {
+ if(subnet[i].subnet == (*p & subnet[i].mask)) {
sbn = (unsigned char *)&subnet[i].subnet;
msk = (unsigned char *)&subnet[i].mask;
@@ -3817,7 +3817,7 @@ int char_lan_config_read(const char *lancfgName) { FILE *fp;
int line_num = 0;
- char line[1024], w1[64], w2[64], w3[64], w4[64], w5[64];
+ char line[1024], w1[64], w2[64], w3[64], w4[64];
if((fp = fopen(lancfgName, "r")) == NULL) {
ShowWarning("LAN Support configuration file is not found: %s\n", lancfgName);
@@ -3833,7 +3833,7 @@ int char_lan_config_read(const char *lancfgName) { continue;
line[sizeof(line)-1] = '\0';
- if(sscanf(line,"%[^:]: %[^/]/%[^:]:%[^:]:%[^\r\n]", w1, w2, w3, w4, w5) != 5) {
+ if(sscanf(line,"%[^:]: %[^:]:%[^:]:%[^\r\n]", w1, w2, w3, w4) != 4) {
ShowWarning("Error syntax of configuration file %s in line %d.\n", lancfgName, line_num);
continue;
@@ -3843,19 +3843,22 @@ int char_lan_config_read(const char *lancfgName) { remove_control_chars((unsigned char *)w2);
remove_control_chars((unsigned char *)w3);
remove_control_chars((unsigned char *)w4);
- remove_control_chars((unsigned char *)w5);
if(strcmpi(w1, "subnet") == 0) {
- subnet[subnet_count].subnet = inet_addr(w2);
- subnet[subnet_count].mask = inet_addr(w3);
- subnet[subnet_count].char_ip = inet_addr(w4);
- subnet[subnet_count].map_ip = inet_addr(w5);
+ subnet[subnet_count].mask = inet_addr(w2);
+ subnet[subnet_count].char_ip = inet_addr(w3);
+ subnet[subnet_count].map_ip = inet_addr(w4);
+ subnet[subnet_count].subnet = subnet[subnet_count].char_ip&subnet[subnet_count].mask;
+ if (subnet[subnet_count].subnet != (subnet[subnet_count].map_ip&subnet[subnet_count].mask)) {
+ ShowError("%s: Configuration Error: The char server (%s) and map server (%s) belong to different subnetworks!\n", lancfgName, w3, w4);
+ continue;
+ }
subnet_count++;
}
- ShowStatus("Information about %d subnetworks readen.\n", subnet_count);
+ ShowStatus("Read information about %d subnetworks.\n", subnet_count);
}
fclose(fp);
|