mirror of
https://github.com/mod-playerbots/azerothcore-wotlk.git
synced 2025-11-29 17:38:24 +08:00
* fix(DB/SmartAI): improve Harry surrendering during quest 'Gambling Debt' (#23598) * fix(DB/Quest): The Kalu'ak dailies reward 500 rep (#23600) * chore(DB): import pending files Referenced commit(s):fb03f41b2a* fix(DB/GameEvent): Remove midsummer pole in K3 (#23614) * chore(DB): import pending files Referenced commit(s):7b0000d6ee* fix(DB/SmartAI): increase reliability of quest event Foolish Endeavors (#23612) * chore(DB): import pending files Referenced commit(s):86f219abbc* fix(Scripts/AreaTrigger): players become stuck after Last Rites (#23613) * chore(DB): import pending files Referenced commit(s):c1a8047cf1* fix(Core/Vmaps): Fix inconsistency of hitInstance and hitModel to cause wrong area ids (#23233) Co-authored-by: ModoX <moardox@gmail.com> Co-authored-by: Shauren <shauren.trinity@gmail.com> Co-authored-by: Grimdhex <237474256+Grimdhex@users.noreply.github.com> Co-authored-by: sudlud <sudlud@users.noreply.github.com> * fix(DB/Gameobject): Sniffed Values for 'Wild Mustard' spawns (#23608) * fix(DB/SmartAI): remove large combat distance of Frostbrood Sentry (#23607) * chore(DB): import pending files Referenced commit(s):41d40b236f* fix(DB/ReputationRewardRate): Patch 3.0.0 gain for Northrend factions (#23597) * chore(DB): import pending files Referenced commit(s):067a898caa* fix(Core/Map): It should be ensured that the instance is unloaded only after the Creature Respawn. (#23103) * fix(Scripts/Northrend): Sniffing Out The Perpetrator horde (#23620) * fix(Scripts/Northrend): ensure Drakuru stays in place during Betrayal (#23619) * chore(DB): import pending files Referenced commit(s):928e145694* fix(DB/SmartAI): quest 'Reconnaissance Flight' (#23628) Co-authored-by: dr-j <dr-j@users.noreply.github.com> Co-authored-by: Killyana <morphone1@gmail.com> * fix(DB/QuestOfferReward): remove mention of a beta recipe in text (#23629) * fix(DB/Conditions): update quest conditions to drop chokers (#23610) * chore(DB): import pending files Referenced commit(s):bca8f7ce07* refactor(Core/PlayerScript): Delete OnPlayerChat, use OnPlayerCanUseChat (#23617) * fix(Core/SmartAI): startup warnings unused params (#23551) * fix(Core/Unit): Druid Talent Survival of the Fittest lacking immunity to creature daze (#23471) * fix(DB/SAI): Fix Fizzcrank Paradrop teleporters (#23633) * chore(DB): import pending files Referenced commit(s):94ba1c210d* fix(Core): Fix waterwalking after dying in instance (#23593) * fix(DB/SAI): don't remove all auras when mounting flamebringer (#23640) * chore(DB): import pending files Referenced commit(s):22f91f3802* fix(DB/SAI): Emerald Lasher goes out of the terrain when aggroed. (#23642) * chore(DB): import pending files Referenced commit(s):f9d6fe41de* fix(DB/SAI): Burning Depths Necromancer no longer stays in place. (#23641) * chore(DB): import pending files Referenced commit(s):1037471c8d* fix(DB/SAI): Remove SmartAI from Valkyrion Harpoon Gun. (#23646) * chore(DB): import pending files Referenced commit(s):8e3a7e6dcf* fix(DB/Creature): Fix Weakened Reanimated Frost Wyrm inhabit type (#23645) * chore(DB): import pending files Referenced commit(s):3baa18ef5b* fix(DB/Spell): Infectious Bites should stack from different casters (#23647) * chore(DB): import pending files Referenced commit(s):5aede412ab* fix(DB/SAI): Solve various issues with It Goes to 11... quest. (#23651) * fix(DB/Loot): Fireproof Satchel will now always drop the Ritual of Torch (#23585) * chore(DB): import pending files Referenced commit(s):1090c209b3* fix(Scripts/Northrend): Betrayal quest (#23650) * fix(Script/BlackTemple): Reliquary of Souls will use 45 degree in front to set incombat (#22938) * fix(Scripts/Spell): Fix Animal Blood spawning when it shouldn't (#23656) * fix(Scripts/BoreanTundra): Script Bloodspore Haze/Psychosis (#23657) * chore(DB): import pending files Referenced commit(s):baf7957e36* fix(DB/SAI): Sibling Rivalry quest credit if mounted (#23659) * chore(DB): import pending files Referenced commit(s):6919cc679d* fix(docs/license): use GPLv2 as MaNGOS-based project (#23655) * fix(Core/Achievements): a character can only have 1 race realm first (#23626) * chore: fix leftover license header (#23678) * fix(Scripts/HoL): Update Loken script (#23587) * fix(Scripts/DTK): Update King Dred script (#23572) * fix(DB/SAI): Bitter Departure quest credit (#23658) * chore(DB): import pending files Referenced commit(s):e595425578* fix(DB/Conditions): Ice Shard require Icy Imprisonment (#23661) * chore(DB): import pending files Referenced commit(s):8294652e77* fix(DB/Loot): add Scourge Curio drop to Lost Shandaral Spirit (#23686) * chore(DB): import pending files Referenced commit(s):b6ed4347fe* fix(DB/Gameobject): fix spell focus location for 'Will of the Titans' (#23683) * chore(DB): import pending files Referenced commit(s):388f18895d* fix(DB/Creature): update IOC Demolisher spells (#23685) * chore(DB): import pending files Referenced commit(s):cdfa50c990* fix(Scripts/Northrend): IOC boss cast ability Mortal Strike (#23684) * fix(Scripts/BoreanTundra): Fix Beryl Sorcerer engaging mobs (#23690) * fix(Core/Entities): Improve interactions between taxis and players regarding PvP flag. (#23681) * fix(DB/Creature): Peon Gakra should be an innkeeper (#23699) * chore(DB): import pending files Referenced commit(s):6abff4ac2b* fix(Scripts/SholazarBasin): Fix Song of Wind and Water double credit (#23707) * fix(DB/SAI): Reanimated Frost Wyrm engage after being hit by quest spell (#23697) * fix(DB/SAI): Timely respawn Nesingwary Trappers (#23703) * fix(DB/Creature): Fix Fjord Hawk Matriarch unit flags (#23696) * fix(DB/Conditions): Fix Fordragon Resolve target conditions (#23701) * chore(DB): import pending files Referenced commit(s):2942d63125* fix(DB/Script): Move Tailhorn Stag and Amberpine Woodsman behavior into SmartAI. (#23708) * fix(DB/Creature): Set Trigger flag on Steam Vent. (#23710) * chore(DB): import pending files Referenced commit(s):435ca302ef* fix(DB/SAI): To Stars' Rest! taxi flight (#23712) * chore(DB): import pending files Referenced commit(s):ab4d59ac9d* fix (DB/Creature): Set Surveyor Orlond flags. (#23714) * chore(DB): import pending files Referenced commit(s):e8ec77dca7* fix(DB/Loot): Fix Master Summoner Staff drop chance (#23717) * chore(DB): import pending files Referenced commit(s):182c055e6e* fix(Scripts/DTK): Fix Oh Novos! achievement (#23539) (#23718) * fix(Core/Spells): Remove King Mrgl-Mrgl costume on spell casting (#23713) * chore(DB): import pending files Referenced commit(s):8c963a11ce* fix(DB/Reputation): Utigarde Pinnacle normal reputation (#23719) * chore(DB): import pending files Referenced commit(s):88ed7d66d5* fix(Scripts/HoS): Clean up faction update hacks (#23720) * fix(DB/Reputation): Lower reputation according to rates handling (#23722) * fix(DB/Reputation): Oculus normal & UP correction (#23723) * chore(DB): import pending files Referenced commit(s):abc2cf3028* fix(Scripts/Oculus): Implement crossfaction support for drakes (#23704) * fix(DB/Quest): Correct prerequisite for Reclaimed Ration (#23736) Co-authored-by: blinkysc <blinkysc@users.noreply.github.com> * fix(DB/Quest): Correct prerequisite for Salvaging Life's Strength (#23734) Co-authored-by: blinkysc <blinkysc@users.noreply.github.com> * chore(DB): import pending files Referenced commit(s):afd8197588* fix(Core/Movement): Fix SummonMovementInform for summons (#23725) * refactor(Core/Movement): Fix Build (#23739) * fix(DB/SAI): Update Iron Rune Construct SAI to use DO_ACTION instead … (#23716) * chore(DB): import pending files Referenced commit(s):7cc39f78e2* fix(DB/SAI): Fix Flamebringer gossip interaction (#23740) * chore(DB): import pending files Referenced commit(s):9cb683cfcd* fix(DB/SAI): Nerub'ar member packs now attack together. (#23727) * chore(DB): import pending files Referenced commit(s):6f5a1b7ccc* fix(DB/SAI): Remove Harrison Johnes quest flag on escort accept (#23700) * chore(DB): import pending files Referenced commit(s):bacf15d356* Update crash issue template with log submission guidelines (#23754) * Merge * Updated OnPlayerChat method name to OnPlayerCanUseChat --------- Co-authored-by: sogladev <sogladev@gmail.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: 天鹭 <18535853+PkllonG@users.noreply.github.com> Co-authored-by: ModoX <moardox@gmail.com> Co-authored-by: Shauren <shauren.trinity@gmail.com> Co-authored-by: Grimdhex <237474256+Grimdhex@users.noreply.github.com> Co-authored-by: sudlud <sudlud@users.noreply.github.com> Co-authored-by: dr-j <dr-j@users.noreply.github.com> Co-authored-by: Killyana <morphone1@gmail.com> Co-authored-by: Undo <50205200+UndoUreche@users.noreply.github.com> Co-authored-by: Andrew <47818697+Nyeriah@users.noreply.github.com> Co-authored-by: killerwife <killerwife@gmail.com> Co-authored-by: Tereneckla <Tereneckla@pm.me> Co-authored-by: Rocco Silipo <108557877+Rorschach91@users.noreply.github.com> Co-authored-by: Ryan Turner <16946913+TheSCREWEDSoftware@users.noreply.github.com> Co-authored-by: blinkysc <37940565+blinkysc@users.noreply.github.com> Co-authored-by: Francesco Borzì <borzifrancesco@gmail.com> Co-authored-by: Benjamin Jackson <38561765+heyitsbench@users.noreply.github.com> Co-authored-by: Traesh <Traesh@users.noreply.github.com> Co-authored-by: blinkysc <blinkysc@users.noreply.github.com>
351 lines
8.5 KiB
C
351 lines
8.5 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at https://curl.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
* SPDX-License-Identifier: curl
|
|
*
|
|
***************************************************************************/
|
|
/* <DESC>
|
|
* Show how CURLOPT_OPENSOCKETFUNCTION can be used to block IP addresses.
|
|
* </DESC>
|
|
*/
|
|
/* This is an advanced example that defines a whitelist or a blacklist to
|
|
* filter IP addresses.
|
|
*/
|
|
|
|
#ifdef __AMIGA__
|
|
#include <stdio.h>
|
|
int main(void) { printf("AmigaOS is not supported.\n"); return 1; }
|
|
#else
|
|
|
|
#ifdef _WIN32
|
|
#ifndef _CRT_SECURE_NO_WARNINGS
|
|
#define _CRT_SECURE_NO_WARNINGS
|
|
#endif
|
|
#ifndef _CRT_NONSTDC_NO_DEPRECATE
|
|
#define _CRT_NONSTDC_NO_DEPRECATE
|
|
#endif
|
|
#ifndef _WIN32_WINNT
|
|
#define _WIN32_WINNT 0x0600
|
|
#endif
|
|
#include <winsock2.h>
|
|
#include <ws2tcpip.h>
|
|
#include <windows.h>
|
|
#else
|
|
#include <sys/types.h>
|
|
#include <sys/socket.h>
|
|
#include <netinet/in.h>
|
|
#include <arpa/inet.h>
|
|
#endif
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include <curl/curl.h>
|
|
|
|
#ifndef TRUE
|
|
#define TRUE 1
|
|
#endif
|
|
|
|
#ifndef FALSE
|
|
#define FALSE 0
|
|
#endif
|
|
|
|
struct ip {
|
|
/* The user-provided IP address or network (use CIDR) to filter */
|
|
char *str;
|
|
/* IP address family AF_INET (IPv4) or AF_INET6 (IPv6) */
|
|
int family;
|
|
/* IP in network byte format */
|
|
union netaddr {
|
|
struct in_addr ipv4;
|
|
#ifdef AF_INET6
|
|
struct in6_addr ipv6;
|
|
#endif
|
|
} netaddr;
|
|
/* IP bits to match against.
|
|
* This is equal to the CIDR notation or max bits if no CIDR.
|
|
* For example if ip->str is 127.0.0.0/8 then ip->maskbits is 8.
|
|
*/
|
|
int maskbits;
|
|
struct ip *next;
|
|
};
|
|
|
|
enum connection_filter_t {
|
|
CONNECTION_FILTER_BLACKLIST,
|
|
CONNECTION_FILTER_WHITELIST
|
|
};
|
|
|
|
struct connection_filter {
|
|
struct ip *list;
|
|
enum connection_filter_t type;
|
|
int verbose;
|
|
#ifdef AF_INET6
|
|
/* If the address being filtered is an IPv4-mapped IPv6 address then it is
|
|
* checked against IPv4 list entries as well, unless ipv6_v6only is set TRUE.
|
|
*/
|
|
int ipv6_v6only;
|
|
#endif
|
|
};
|
|
|
|
static struct ip *ip_list_append(struct ip *list, const char *data)
|
|
{
|
|
struct ip *ip, *last;
|
|
char *cidr;
|
|
|
|
ip = (struct ip *)calloc(1, sizeof(*ip));
|
|
if(!ip)
|
|
return NULL;
|
|
|
|
if(strchr(data, ':')) {
|
|
#ifdef AF_INET6
|
|
ip->family = AF_INET6;
|
|
#else
|
|
free(ip);
|
|
return NULL;
|
|
#endif
|
|
}
|
|
else
|
|
ip->family = AF_INET;
|
|
|
|
ip->str = strdup(data);
|
|
if(!ip->str) {
|
|
free(ip);
|
|
return NULL;
|
|
}
|
|
|
|
/* determine the number of bits that this IP will match against */
|
|
cidr = strchr(ip->str, '/');
|
|
if(cidr) {
|
|
ip->maskbits = atoi(cidr + 1);
|
|
if(ip->maskbits <= 0 ||
|
|
#ifdef AF_INET6
|
|
(ip->family == AF_INET6 && ip->maskbits > 128) ||
|
|
#endif
|
|
(ip->family == AF_INET && ip->maskbits > 32)) {
|
|
free(ip->str);
|
|
free(ip);
|
|
return NULL;
|
|
}
|
|
/* ignore the CIDR notation when converting ip->str to ip->netaddr */
|
|
*cidr = '\0';
|
|
}
|
|
else if(ip->family == AF_INET)
|
|
ip->maskbits = 32;
|
|
#ifdef AF_INET6
|
|
else if(ip->family == AF_INET6)
|
|
ip->maskbits = 128;
|
|
#endif
|
|
|
|
if(1 != inet_pton(ip->family, ip->str, &ip->netaddr)) {
|
|
free(ip->str);
|
|
free(ip);
|
|
return NULL;
|
|
}
|
|
|
|
if(cidr)
|
|
*cidr = '/';
|
|
|
|
if(!list)
|
|
return ip;
|
|
for(last = list; last->next; last = last->next)
|
|
;
|
|
last->next = ip;
|
|
return list;
|
|
}
|
|
|
|
static void ip_list_free_all(struct ip *list)
|
|
{
|
|
struct ip *next;
|
|
while(list) {
|
|
next = list->next;
|
|
free(list->str);
|
|
free(list);
|
|
list = next;
|
|
}
|
|
}
|
|
|
|
static void free_connection_filter(struct connection_filter *filter)
|
|
{
|
|
if(filter) {
|
|
ip_list_free_all(filter->list);
|
|
free(filter);
|
|
}
|
|
}
|
|
|
|
static int ip_match(struct ip *ip, void *netaddr)
|
|
{
|
|
int bytes, tailbits;
|
|
const unsigned char *x, *y;
|
|
|
|
x = (unsigned char *)&ip->netaddr;
|
|
y = (unsigned char *)netaddr;
|
|
|
|
for(bytes = ip->maskbits / 8; bytes; --bytes) {
|
|
if(*x++ != *y++)
|
|
return FALSE;
|
|
}
|
|
|
|
tailbits = ip->maskbits % 8;
|
|
if(tailbits) {
|
|
unsigned char tailmask = (unsigned char)((0xFF << (8 - tailbits)) & 0xFF);
|
|
if((*x & tailmask) != (*y & tailmask))
|
|
return FALSE;
|
|
}
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
#ifdef AF_INET6
|
|
static int is_ipv4_mapped_ipv6_address(int family, void *netaddr)
|
|
{
|
|
if(family == AF_INET6) {
|
|
int i;
|
|
unsigned char *x = (unsigned char *)netaddr;
|
|
for(i = 0; i < 12; ++i) {
|
|
if(x[i])
|
|
break;
|
|
}
|
|
/* support formats ::x.x.x.x (deprecated) and ::ffff:x.x.x.x */
|
|
if((i == 12 && (x[i] || x[i + 1] || x[i + 2] || x[i + 3])) ||
|
|
(i == 10 && (x[i] == 0xFF && x[i + 1] == 0xFF)))
|
|
return TRUE;
|
|
}
|
|
|
|
return FALSE;
|
|
}
|
|
#endif /* AF_INET6 */
|
|
|
|
static curl_socket_t opensocket(void *clientp,
|
|
curlsocktype purpose,
|
|
struct curl_sockaddr *address)
|
|
{
|
|
/* filter the address */
|
|
if(purpose == CURLSOCKTYPE_IPCXN) {
|
|
void *cinaddr = NULL;
|
|
|
|
if(address->family == AF_INET)
|
|
cinaddr = &((struct sockaddr_in *)(void *)&address->addr)->sin_addr;
|
|
#ifdef AF_INET6
|
|
else if(address->family == AF_INET6)
|
|
cinaddr = &((struct sockaddr_in6 *)(void *)&address->addr)->sin6_addr;
|
|
#endif
|
|
|
|
if(cinaddr) {
|
|
struct ip *ip;
|
|
struct connection_filter *filter = (struct connection_filter *)clientp;
|
|
#ifdef AF_INET6
|
|
int mapped = !filter->ipv6_v6only &&
|
|
is_ipv4_mapped_ipv6_address(address->family, cinaddr);
|
|
#endif
|
|
|
|
for(ip = filter->list; ip; ip = ip->next) {
|
|
if(ip->family == address->family && ip_match(ip, cinaddr))
|
|
break;
|
|
#ifdef AF_INET6
|
|
if(mapped && ip->family == AF_INET && address->family == AF_INET6 &&
|
|
ip_match(ip, (unsigned char *)cinaddr + 12))
|
|
break;
|
|
#endif
|
|
}
|
|
|
|
if(ip && filter->type == CONNECTION_FILTER_BLACKLIST) {
|
|
if(filter->verbose) {
|
|
char buf[128] = {0};
|
|
inet_ntop(address->family, cinaddr, buf, sizeof(buf));
|
|
fprintf(stderr, "* Rejecting IP %s due to blacklist entry %s.\n",
|
|
buf, ip->str);
|
|
}
|
|
return CURL_SOCKET_BAD;
|
|
}
|
|
else if(!ip && filter->type == CONNECTION_FILTER_WHITELIST) {
|
|
if(filter->verbose) {
|
|
char buf[128] = {0};
|
|
inet_ntop(address->family, cinaddr, buf, sizeof(buf));
|
|
fprintf(stderr,
|
|
"* Rejecting IP %s due to missing whitelist entry.\n", buf);
|
|
}
|
|
return CURL_SOCKET_BAD;
|
|
}
|
|
}
|
|
}
|
|
|
|
return socket(address->family, address->socktype, address->protocol);
|
|
}
|
|
|
|
int main(void)
|
|
{
|
|
CURL *curl;
|
|
CURLcode res;
|
|
struct connection_filter *filter;
|
|
|
|
filter = (struct connection_filter *)calloc(1, sizeof(*filter));
|
|
if(!filter)
|
|
exit(1);
|
|
|
|
if(curl_global_init(CURL_GLOBAL_DEFAULT))
|
|
exit(1);
|
|
|
|
curl = curl_easy_init();
|
|
if(!curl)
|
|
exit(1);
|
|
|
|
/* Set the target URL */
|
|
curl_easy_setopt(curl, CURLOPT_URL, "http://localhost");
|
|
|
|
/* Define an IP connection filter.
|
|
* If an address has CIDR notation then it matches the network.
|
|
* For example 74.6.143.25/24 matches 74.6.143.0 - 74.6.143.255.
|
|
*/
|
|
filter->type = CONNECTION_FILTER_BLACKLIST;
|
|
filter->list = ip_list_append(filter->list, "98.137.11.164");
|
|
filter->list = ip_list_append(filter->list, "127.0.0.0/8");
|
|
#ifdef AF_INET6
|
|
filter->list = ip_list_append(filter->list, "::1");
|
|
#endif
|
|
|
|
/* Set the socket function which does the filtering */
|
|
curl_easy_setopt(curl, CURLOPT_OPENSOCKETFUNCTION, opensocket);
|
|
curl_easy_setopt(curl, CURLOPT_OPENSOCKETDATA, filter);
|
|
|
|
/* Verbose mode */
|
|
filter->verbose = TRUE;
|
|
curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
|
|
|
|
/* Perform the request */
|
|
res = curl_easy_perform(curl);
|
|
|
|
/* Check for errors */
|
|
if(res != CURLE_OK) {
|
|
fprintf(stderr, "curl_easy_perform() failed: %s\n",
|
|
curl_easy_strerror(res));
|
|
}
|
|
|
|
/* Clean up */
|
|
curl_easy_cleanup(curl);
|
|
free_connection_filter(filter);
|
|
|
|
/* Clean up libcurl */
|
|
curl_global_cleanup();
|
|
|
|
return 0;
|
|
}
|
|
#endif
|