X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Ffnet-dc.c;h=33c7b6facbe87bc8b311fd484cb5cf94654eaac0;hb=62da27122178606db9029d8442b398a091c57246;hp=75c5c8b03e0df0f86b5814efba655348005e3eb2;hpb=565006d1a65a2d81e93215da8501df3791fa37a7;p=doldaconnect.git diff --git a/daemon/fnet-dc.c b/daemon/fnet-dc.c index 75c5c8b..33c7b6f 100644 --- a/daemon/fnet-dc.c +++ b/daemon/fnet-dc.c @@ -106,7 +106,8 @@ struct dchub char *inbuf; size_t inbufdata, inbufsize; struct qcommand *queue; - int extended; + int extended, dcppemu; + char *charset; char *nativename; char *nativenick; }; @@ -134,11 +135,12 @@ struct dcpeer int state; int ptclose; /* Close after transfer is complete */ int accepted; /* If false, we connected, otherwise, we accepted */ - int extended; + int extended, dcppemu; int direction; /* Using the constants from transfer.h */ int compress; int hascurpos, fetchingtthl, notthl; struct tigertreehash tth; + char *charset; void *cprsdata; char *key; char *nativename; @@ -388,7 +390,9 @@ static void hubrecvchat(struct socket *sk, struct fnetnode *fn, char *from, char wchar_t *chat, *wfrom, *wpeer; char *p, *end; struct fnetpeer *peer; + struct dchub *hub; + hub = fn->data; end = string + strlen(string); while((p = strchr(string, 13)) != NULL) memmove(p, p + 1, (end-- - p)); @@ -396,7 +400,7 @@ static void hubrecvchat(struct socket *sk, struct fnetnode *fn, char *from, char { if((strlen(string) > strlen(from) + 2) && (*string == '<') && !memcmp(string + 1, from, strlen(from)) && (*(string + strlen(from) + 1) == '>')) string += strlen(from) + 2; - if((wfrom = icmbstowcs(from, DCCHARSET)) == NULL) + if((wfrom = icmbstowcs(from, hub->charset)) == NULL) return; wpeer = swcsdup(wfrom); } else { @@ -414,7 +418,7 @@ static void hubrecvchat(struct socket *sk, struct fnetnode *fn, char *from, char *(p++) = 0; if(*p == ' ') p++; - if((wpeer = icmbstowcs(string + 1, DCCHARSET)) == NULL) + if((wpeer = icmbstowcs(string + 1, hub->charset)) == NULL) return; string = p; } @@ -422,7 +426,7 @@ static void hubrecvchat(struct socket *sk, struct fnetnode *fn, char *from, char if(wpeer == NULL) wpeer = swcsdup(L""); } - if((chat = icmbstowcs(string, DCCHARSET)) == NULL) + if((chat = icmbstowcs(string, hub->charset)) == NULL) { if(wfrom != NULL) free(wfrom); @@ -586,6 +590,7 @@ static char *getadcid(struct dcpeer *peer) char *ret; int isfilelist; + isfilelist = 0; if(!wcscmp(peer->transfer->path, L"files.xml") || !wcscmp(peer->transfer->path, L"files.xml.bz2") || !wcscmp(peer->transfer->path, L"MyList.DcLst")) isfilelist = 1; if(!isfilelist && (peer->transfer->hash != NULL) && isdchash(peer->transfer->hash) && supports(peer, "tthf")) @@ -623,31 +628,29 @@ static int trresumecb(struct transfer *transfer, wchar_t *cmd, wchar_t *arg, str static void sendmynick(struct dcpeer *peer) { - struct dchub *hub; + struct fnetnode *fn; - hub = (peer->fn == NULL)?NULL:(peer->fn->data); - if(hub == NULL) - qstrf(peer->sk, "$MyNick %s|", icswcstombs(confgetstr("cli", "defnick"), DCCHARSET, "DoldaConnectUser-IN")); + fn = peer->fn; + if(fn == NULL) + qstrf(peer->sk, "$MyNick %s|", icswcstombs(confgetstr("cli", "defnick"), peer->charset, "DoldaConnectUser-IN")); else - qstrf(peer->sk, "$MyNick %s|", hub->nativenick); + qstrf(peer->sk, "$MyNick %s|", icswcstombs(fn->mynick, peer->charset, "DoldaConnectUser-IN")); } static void sendpeerlock(struct dcpeer *peer) { -#ifdef DCPP_MASQUERADE - qstrf(peer->sk, "$Lock EXTENDEDPROTOCOLABCABCABCABCABCABC Pk=DCPLUSPLUS0.674ABCABC|"); -#else - qstrf(peer->sk, "$Lock EXTENDEDPROTOCOLABCABCABCABCABCABC Pk=DOLDA%sABCABCABC|", VERSION); -#endif + if(peer->dcppemu) + qstrf(peer->sk, "$Lock EXTENDEDPROTOCOLABCABCABCABCABCABC Pk=DCPLUSPLUS0.674ABCABC|"); + else + qstrf(peer->sk, "$Lock EXTENDEDPROTOCOLABCABCABCABCABCABC Pk=DOLDA%sABCABCABC|", VERSION); } static void sendsupports(struct dcpeer *peer) { -#ifdef DCPP_MASQUERADE - qstr(peer->sk, "$Supports MiniSlots XmlBZList ADCGet TTHL TTHF GetZBlock ZLIG |"); -#else - qstr(peer->sk, "$Supports MiniSlots XmlBZList ADCGet TTHL TTHF GetZBlock ZLIG|"); -#endif + if(peer->dcppemu) + qstr(peer->sk, "$Supports MiniSlots XmlBZList ADCGet TTHL TTHF GetZBlock ZLIG |"); + else + qstr(peer->sk, "$Supports MiniSlots XmlBZList ADCGet TTHL TTHF GetZBlock ZLIG|"); } static void requestfile(struct dcpeer *peer) @@ -656,6 +659,7 @@ static void requestfile(struct dcpeer *peer) if(peer->transfer->size == -1) { + /* Use DCCHARSET for $Get paths until further researched... */ if((buf = icswcstombs(peer->transfer->path, DCCHARSET, NULL)) == NULL) { transferseterror(peer->transfer, TRNSE_NOTFOUND); @@ -724,6 +728,7 @@ static void requestfile(struct dcpeer *peer) } qstrf(peer->sk, "$UGetBlock %i %i %s|", peer->transfer->curpos, peer->transfer->size - peer->transfer->curpos, buf); } else { + /* Use DCCHARSET for $Get paths until further researched... */ if((buf = icswcstombs(peer->transfer->path, DCCHARSET, NULL)) == NULL) { transferseterror(peer->transfer, TRNSE_NOTFOUND); @@ -743,7 +748,7 @@ static void sendmyinfo(struct socket *sk, struct fnetnode *fn) hub = fn->data; qstrf(sk, "$MyINFO $ALL %s ", hub->nativenick); - buf = tr(icswcstombs(confgetstr("dc", "desc"), DCCHARSET, "Charset_conv_failure"), "$_|_"); + buf = tr(icswcstombs(confgetstr("dc", "desc"), hub->charset, "Charset_conv_failure"), "$_|_"); qstrf(sk, "%s", buf); hn1 = hn2 = hn3 = 0; for(cfn = fnetnodes; cfn != NULL; cfn = cfn->next) @@ -759,16 +764,16 @@ static void sendmyinfo(struct socket *sk, struct fnetnode *fn) } } qstrf(sk, "<%s V:%s,M:%c,H:%i/%i/%i,S:%i>", - DCIDTAG, - DCIDTAGV, + (hub->dcppemu)?"++":"Dolda", + (hub->dcppemu)?"0.674":VERSION, (tcpsock == NULL)?'P':'A', hn1, hn2, hn3, confgetint("transfer", "slots") ); qstrf(sk, "$ $"); - buf = tr(icswcstombs(confgetstr("dc", "speedstring"), DCCHARSET, "Charset_conv_failure"), "$_|_"); + buf = tr(icswcstombs(confgetstr("dc", "speedstring"), hub->charset, "Charset_conv_failure"), "$_|_"); qstrf(sk, "%s\x01$", buf); - buf = tr(icswcstombs(confgetstr("dc", "email"), DCCHARSET, "Charset_conv_failure"), "$_|_"); + buf = tr(icswcstombs(confgetstr("dc", "email"), hub->charset, "Charset_conv_failure"), "$_|_"); qstrf(sk, "%s$", buf); qstrf(sk, "%llu$|", sharesize); } @@ -807,11 +812,10 @@ static void cmd_lock(struct socket *sk, struct fnetnode *fn, char *cmd, char *ar *(p++) = 0; if(hub->extended) { -#ifdef DCPP_MASQUERADE - qstrf(sk, "$Supports UserCommand NoGetINFO NoHello UserIP2 TTHSearch GetZBlock |"); -#else - qstrf(sk, "$Supports UserCommand NoGetINFO NoHello UserIP2 TTHSearch GetZBlock|"); -#endif + if(hub->dcppemu) + qstrf(sk, "$Supports UserCommand NoGetINFO NoHello UserIP2 TTHSearch GetZBlock |"); + else + qstrf(sk, "$Supports UserCommand NoGetINFO NoHello UserIP2 TTHSearch GetZBlock|"); } key = dcmakekey(args); qstrf(sk, "$Key %s|", key); @@ -828,7 +832,7 @@ static void cmd_hubname(struct socket *sk, struct fnetnode *fn, char *cmd, char if(hub->nativename == NULL) free(hub->nativename); hub->nativename = sstrdup(args); - buf = icmbstowcs(args, DCCHARSET); + buf = icmbstowcs(args, hub->charset); fnetsetname(fn, (buf == NULL)?L"Hubname conv error":buf); if(buf != NULL) free(buf); @@ -841,7 +845,7 @@ static void cmd_hello(struct socket *sk, struct fnetnode *fn, char *cmd, char *a struct dchub *hub; hub = fn->data; - if((nick = icmbstowcs(args, DCCHARSET)) == NULL) + if((nick = icmbstowcs(args, hub->charset)) == NULL) return; if(strcmp(args, hub->nativenick) && (fnetfindpeer(fn, nick) == NULL)) fnetaddpeer(fn, nick, nick); @@ -856,7 +860,7 @@ static void cmd_quit(struct socket *sk, struct fnetnode *fn, char *cmd, char *ar struct dchub *hub; hub = fn->data; - if((nick = icmbstowcs(args, DCCHARSET)) == NULL) + if((nick = icmbstowcs(args, hub->charset)) == NULL) return; if((peer = fnetfindpeer(fn, nick)) != NULL) fnetdelpeer(peer); @@ -877,7 +881,7 @@ static void cmd_nicklist(struct socket *sk, struct fnetnode *fn, char *cmd, char while((p = strstr(args, "$$")) != NULL) { *p = 0; - if((buf = icmbstowcs(args, DCCHARSET)) != NULL) + if((buf = icmbstowcs(args, hub->charset)) != NULL) { if((peer = fnetfindpeer(fn, buf)) == NULL) peer = fnetaddpeer(fn, buf, buf); @@ -910,7 +914,7 @@ static void cmd_oplist(struct socket *sk, struct fnetnode *fn, char *cmd, char * while((p = strstr(args, "$$")) != NULL) { *p = 0; - if((buf = icmbstowcs(args, DCCHARSET)) != NULL) + if((buf = icmbstowcs(args, hub->charset)) != NULL) { if((peer = fnetfindpeer(fn, buf)) != NULL) peer->flags.b.op = 1; @@ -937,7 +941,7 @@ static void cmd_myinfo(struct socket *sk, struct fnetnode *fn, char *cmd, char * if((p2 = strchr(p, ' ')) == NULL) return; *p2 = 0; - if((buf = icmbstowcs(p, DCCHARSET)) == NULL) + if((buf = icmbstowcs(p, hub->charset)) == NULL) return; if((peer = fnetfindpeer(fn, buf)) == NULL) peer = fnetaddpeer(fn, buf, buf); @@ -946,9 +950,9 @@ static void cmd_myinfo(struct socket *sk, struct fnetnode *fn, char *cmd, char * if((p2 = strstr(p, "$ $")) == NULL) return; *p2 = 0; - if((buf = icmbstowcs(p, DCCHARSET)) == NULL) + if((buf = icmbstowcs(p, hub->charset)) == NULL) return; - if((wcslen(buf) > 0) && (buf[wcslen(buf) - 1] == L'>') && ((wp = wcschr(buf, L'<')) != NULL)) + if((wcslen(buf) > 0) && (buf[wcslen(buf) - 1] == L'>') && ((wp = wcsrchr(buf, L'<')) != NULL)) { buf[wcslen(buf) - 1] = L'\0'; *(wp++) = L'\0'; @@ -975,7 +979,7 @@ static void cmd_myinfo(struct socket *sk, struct fnetnode *fn, char *cmd, char * if((p2 = strchr(p, '$')) == NULL) return; *(p2 - 1) = 0; - if((buf = icmbstowcs(p, DCCHARSET)) == NULL) + if((buf = icmbstowcs(p, hub->charset)) == NULL) return; fnetpeersetstr(peer, L"dc-speed", buf); free(buf); @@ -983,7 +987,7 @@ static void cmd_myinfo(struct socket *sk, struct fnetnode *fn, char *cmd, char * if((p2 = strchr(p, '$')) == NULL) return; *p2 = 0; - if((buf = icmbstowcs(p, DCCHARSET)) == NULL) + if((buf = icmbstowcs(p, hub->charset)) == NULL) return; fnetpeersetstr(peer, L"email", buf); free(buf); @@ -1023,7 +1027,7 @@ static void cmd_forcemove(struct socket *sk, struct fnetnode *fn, char *cmd, cha free(args); } -static char *getdcpath(struct sharecache *node, size_t *retlen) +static char *getdcpath(struct sharecache *node, size_t *retlen, char *charset) { char *buf, *buf2; size_t len, len2; @@ -1032,15 +1036,15 @@ static char *getdcpath(struct sharecache *node, size_t *retlen) return(NULL); if(node->parent == shareroot) { - if((buf = icwcstombs(node->name, DCCHARSET)) == NULL) + if((buf = icwcstombs(node->name, charset)) == NULL) return(NULL); if(retlen != NULL) *retlen = strlen(buf); return(buf); } else { - if((buf2 = icwcstombs(node->name, DCCHARSET)) == NULL) + if((buf2 = icwcstombs(node->name, charset)) == NULL) return(NULL); - if((buf = getdcpath(node->parent, &len)) == NULL) + if((buf = getdcpath(node->parent, &len, charset)) == NULL) { free(buf2); return(NULL); @@ -1169,7 +1173,7 @@ static void cmd_search(struct socket *sk, struct fnetnode *fn, char *cmd, char * memcpy(hashtth, buf, 24); free(buf); } else { - if((terms[termnum] = icmbstowcs(p, DCCHARSET)) != NULL) + if((terms[termnum] = icmbstowcs(p, hub->charset)) != NULL) termnum++; } } @@ -1217,7 +1221,8 @@ static void cmd_search(struct socket *sk, struct fnetnode *fn, char *cmd, char * } if(!skipcheck && (satisfied == termnum)) { - if((buf = getdcpath(node, NULL)) != NULL) + /* Use DCCHARSET in $Get paths until further researched... */ + if((buf = getdcpath(node, NULL, DCCHARSET)) != NULL) { if(node->f.b.hastth) { @@ -1408,8 +1413,9 @@ static void cmd_sr(struct socket *sk, struct fnetnode *fn, char *cmd, char *args if((p2 = strstr(p, " (")) == NULL) return; *p2 = 0; - if((wnick = icmbstowcs(nick, DCCHARSET)) == NULL) + if((wnick = icmbstowcs(nick, hub->charset)) == NULL) return; + /* Use DCCHARSET in $Get paths until further researched... */ if((wfile = icmbstowcs(filename, DCCHARSET)) == NULL) { free(wnick); @@ -1446,16 +1452,12 @@ static void cmd_usercommand(struct socket *sk, struct fnetnode *fn, char *cmd, c static void cmd_getpass(struct socket *sk, struct fnetnode *fn, char *cmd, char *args) { struct dchub *hub; - struct wcspair *arg; + wchar_t *pw; char *mbspw; hub = fn->data; - for(arg = fn->args; arg != NULL; arg = arg->next) - { - if(!wcscmp(arg->key, L"password")) - break; - } - if((arg == NULL) || ((mbspw = icwcstombs(arg->val, DCCHARSET)) == NULL)) + pw = wpfind(fn->args, L"password"); + if((pw == NULL) || ((mbspw = icwcstombs(pw, hub->charset)) == NULL)) { killfnetnode(fn); return; @@ -1478,13 +1480,14 @@ static void cmd_logedin(struct socket *sk, struct fnetnode *fn, char *cmd, char static void cmd_mynick(struct socket *sk, struct dcpeer *peer, char *cmd, char *args) { struct dcexppeer *expect; + struct dchub *hub; if(peer->nativename != NULL) free(peer->nativename); peer->nativename = sstrdup(args); if(peer->wcsname != NULL) free(peer->wcsname); - if((peer->wcsname = icmbstowcs(peer->nativename, DCCHARSET)) == NULL) + if((peer->wcsname = icmbstowcs(peer->nativename, peer->charset)) == NULL) { freedcpeer(peer); return; @@ -1500,8 +1503,10 @@ static void cmd_mynick(struct socket *sk, struct dcpeer *peer, char *cmd, char * { peer->fn = NULL; } else { + hub = expect->fn->data; peer->fn = expect->fn; getfnetnode(peer->fn); + peer->dcppemu = hub->dcppemu; freeexppeer(expect); } } @@ -1595,6 +1600,7 @@ static void cmd_peerlock(struct socket *sk, struct dcpeer *peer, char *cmd, char peer->transfer = transfer; qstrf(sk, "$Direction %s %i|", (peer->direction == TRNSD_UP)?"Upload":"Download", rand() % 10000); qstrf(sk, "$Key %s|", key); + free(key); } else { if(peer->key != NULL) free(peer->key); @@ -1795,6 +1801,7 @@ static void cmd_get(struct socket *sk, struct dcpeer *peer, char *cmd, char *arg } if(fd < 0) { + /* Use DCCHARSET in $Get paths until further researched... */ if((node = resdcpath(args, DCCHARSET, '\\')) == NULL) { qstrf(sk, "$Error File not in share|"); @@ -1923,6 +1930,7 @@ static void cmd_getblock(struct socket *sk, struct dcpeer *peer, char *cmd, char if(!strcmp(cmd, "$UGetBlock") || !strcmp(cmd, "$UGetZBlock")) charset = "UTF-8"; else + /* Use DCCHARSET in $Get paths until further researched... */ charset = DCCHARSET; if(!strcmp(cmd, "$GetZBlock") || !strcmp(cmd, "$UGetZBlock")) initcompress(peer, CPRS_ZLIB); @@ -2266,7 +2274,7 @@ static int hubreqconn(struct fnetpeer *peer) errno = EFAULT; return(1); } - if((mbsnick = icwcstombs(peer->id, DCCHARSET)) == NULL) + if((mbsnick = icwcstombs(peer->id, hub->charset)) == NULL) return(1); /* Shouldn't happen, of course, but who knows... */ if(tcpsock != NULL) { @@ -2285,12 +2293,12 @@ static int hubsendchat(struct fnetnode *fn, int public, wchar_t *to, wchar_t *st char *mbsstring, *mbsto; hub = fn->data; - if((mbsto = icwcstombs(to, DCCHARSET)) == NULL) + if((mbsto = icwcstombs(to, hub->charset)) == NULL) { errno = EILSEQ; return(1); } - if((mbsstring = icwcstombs(string, DCCHARSET)) == NULL) + if((mbsstring = icwcstombs(string, hub->charset)) == NULL) { errno = EILSEQ; return(1); @@ -2460,10 +2468,10 @@ static int hubsearch(struct fnetnode *fn, struct search *srch, struct srchfnnlis if(minsize != 0) { sizebuf2(sstr, sstrdata + 32, 1); - snprintf(sstr + sstrdata, sstrsize - sstrdata, "T?F?%i?1?", minsize); + sstrdata += snprintf(sstr + sstrdata, sstrsize - sstrdata, "T?F?%i?1?", minsize); } else if(maxsize != -1) { sizebuf2(sstr, sstrdata + 32, 1); - snprintf(sstr + sstrdata, sstrsize - sstrdata, "T?T?%i?1?", maxsize); + sstrdata += snprintf(sstr + sstrdata, sstrsize - sstrdata, "T?T?%i?1?", maxsize); } else { bufcat(sstr, "F?F?0?1?", 8); } @@ -2471,6 +2479,7 @@ static int hubsearch(struct fnetnode *fn, struct search *srch, struct srchfnnlis { for(cur = list; cur != NULL; cur = cur->next) { + /* Use DCCHARSET in $Get paths until further researched... */ if((buf = icwcstombs(cur->str, DCCHARSET)) == NULL) { /* Can't find anything anyway if the search expression @@ -2651,6 +2660,7 @@ static void dctransgotdata(struct transfer *transfer, struct dcpeer *peer) endcompress(peer); transfersetstate(transfer, TRNS_HS); socksettos(peer->sk, confgetint("fnet", "fnptos")); + transfer->flags.b.minislot = 0; peer->sk->writecb = NULL; } } @@ -2727,6 +2737,7 @@ static void udpread(struct socket *sk, void *data) char *buf, *p, *p2, *hashbuf; size_t buflen, hashlen; char *nick, *filename, *hubname; + struct sockaddr_in hubaddr; int size, slots; struct fnetnode *fn, *myfn; struct dchub *hub; @@ -2786,14 +2797,30 @@ static void udpread(struct socket *sk, void *data) return; } *p2 = 0; - if((wnick = icmbstowcs(nick, DCCHARSET)) == NULL) + p = p2 + 2; + if((p2 = strchr(p, ':')) == NULL) + { + free(buf); + return; + } + *(p2++) = 0; + hubaddr.sin_family = AF_INET; + if(!inet_aton(p, &hubaddr.sin_addr)) + { + free(buf); + return; + } + p = p2; + if((p2 = strchr(p, ')')) == NULL) { free(buf); return; } + *p2 = 0; + hubaddr.sin_port = htons(atoi(p)); + /* Use DCCHARSET in $Get paths until further researched... */ if((wfile = icmbstowcs(filename, DCCHARSET)) == NULL) { - free(wnick); free(buf); return; } @@ -2825,6 +2852,25 @@ static void udpread(struct socket *sk, void *data) } } } + if(myfn == NULL) + { + for(fn = fnetnodes; fn != NULL; fn = fn->next) + { + if((fn->fnet == &dcnet) && (fn->sk != NULL) && addreq(fn->sk->remote, (struct sockaddr *)&hubaddr)) + { + myfn = fn; + break; + } + } + } + hub = NULL; + if(myfn != NULL) + hub = myfn->data; + if((wnick = icmbstowcs(nick, (hub == NULL)?DCCHARSET:(hub->charset))) == NULL) + { + free(buf); + return; + } sr = newsrchres(&dcnet, wfile, wnick); if(sr->peernick != NULL) free(sr->peernick); @@ -2881,7 +2927,7 @@ static int hubsetnick(struct fnetnode *fn, wchar_t *newnick) char *buf; hub = fn->data; - if((buf = icwcstombs(newnick, DCCHARSET)) == NULL) + if((buf = icwcstombs(newnick, (hub == NULL)?DCCHARSET:(hub->charset))) == NULL) return(1); if((strchr(buf, ' ') != NULL) || (strchr(buf, '|') != NULL) || (strchr(buf, '$') != NULL)) { @@ -2902,10 +2948,38 @@ static int hubsetnick(struct fnetnode *fn, wchar_t *newnick) static struct dchub *newdchub(struct fnetnode *fn) { struct dchub *new; + wchar_t *emu; + wchar_t *wcharset; + char *charset; new = smalloc(sizeof(*new)); memset(new, 0, sizeof(*new)); fn->data = new; + if(confgetint("dc", "dcppemu")) + new->dcppemu = 1; + if((emu = wpfind(fn->args, L"dcppemu")) != NULL) + { + if(*emu == L'y') + new->dcppemu = 1; + if(*emu == L'n') + new->dcppemu = 0; + } + charset = NULL; + if((wcharset = wpfind(fn->args, L"charset")) != NULL) + { + if((charset = icwcstombs(wcharset, "US-ASCII")) != NULL) + { + if(!havecharset(charset)) + { + free(charset); + charset = NULL; + } + } + } + if(charset != NULL) + new->charset = charset; + else + new->charset = sstrdup(DCCHARSET); if(hubsetnick(fn, fn->mynick)) fnetsetnick(fn, L"DoldaConnectUser-IN"); /* IN as in Invalid Nick */ @@ -2921,6 +2995,8 @@ static struct dcpeer *newdcpeer(struct socket *sk) new->transfer = NULL; getsock(sk); new->sk = sk; + if(confgetint("dc", "dcppemu")) + new->dcppemu = 1; new->next = peers; new->prev = NULL; if(peers != NULL) @@ -2973,6 +3049,8 @@ static void freedcpeer(struct dcpeer *peer) free(peer->wcsname); if(peer->nativename != NULL) free(peer->nativename); + if(peer->charset != NULL) + free(peer->charset); if(peer->fn != NULL) putfnetnode(peer->fn); while((qcmd = ulqcmd(&peer->queue)) != NULL) @@ -2997,13 +3075,10 @@ static void hubdestroy(struct fnetnode *fn) struct qcommand *qcmd; hub = (struct dchub *)fn->data; - if(fn->sk != NULL) + if((fn->sk != NULL) && (fn->sk->data == fn)) { - if(fn->sk->data == fn) - { - fn->sk->data = NULL; - putfnetnode(fn); - } + fn->sk->data = NULL; + putfnetnode(fn); } if(hub == NULL) return; @@ -3013,6 +3088,8 @@ static void hubdestroy(struct fnetnode *fn) free(hub->nativename); if(hub->nativenick != NULL) free(hub->nativenick); + if(hub->charset != NULL) + free(hub->charset); if(hub->inbuf != NULL) free(hub->inbuf); free(hub); @@ -3091,15 +3168,18 @@ static void peererror(struct socket *sk, int err, struct dcpeer *peer) static void peerconnect(struct socket *sk, int err, struct fnetnode *fn) { struct dcpeer *peer; + struct dchub *hub; if(err != 0) { putfnetnode(fn); return; } + hub = fn->data; peer = newdcpeer(sk); peer->fn = fn; peer->accepted = 0; + peer->dcppemu = hub->dcppemu; sk->readcb = (void (*)(struct socket *, void *))peerread; sk->errcb = (void (*)(struct socket *, int, void *))peererror; sk->data = peer; @@ -3138,6 +3218,7 @@ static void updatehmlist(void) while(1) { ic = 0; + /* Use DCCHARSET in $Get paths until further researched... */ if((buf2 = icwcstombs(node->name, DCCHARSET)) != NULL) { for(i = 0; i < lev; i++) @@ -3302,7 +3383,10 @@ static void updatexmllist(void) for(i = 0; i < sizeof(cidbuf) - 1; i++) cidbuf[i] = (rand() % ('Z' - 'A' + 1)) + 'A'; cidbuf[i] = 0; - fprintf(fs, "\r\n", cidbuf, DCIDFULL); + if(confgetint("dc", "dcppemu")) + fprintf(fs, "\r\n", cidbuf); + else + fprintf(fs, "\r\n", cidbuf, "DoldaConnect" VERSION); node = shareroot->child; lev = 0; @@ -3347,11 +3431,10 @@ static void updatexmllist(void) } } -#ifdef DCPP_MASQUERADE - fprintf(fs, ""); -#else - fprintf(fs, "\r\n"); -#endif + if(confgetint("dc", "dcppemu")) + fprintf(fs, ""); + else + fprintf(fs, "\r\n"); fclose(fs); } @@ -3592,6 +3675,7 @@ static struct configvar myvars[] = {CONF_VAR_STRING, "email", {.str = L"spam@spam.org"}}, {CONF_VAR_INT, "udpport", {.num = 0}}, {CONF_VAR_INT, "tcpport", {.num = 0}}, + {CONF_VAR_BOOL, "dcppemu", {.num = 0}}, {CONF_VAR_END} };