Skip to content

Commit 8e8543e

Browse files
floppyhammervertexodessa
authored andcommitted
Fix libusb leak & Remove unnecessary socket
1 parent f67884e commit 8e8543e

File tree

1 file changed

+2
-17
lines changed

1 file changed

+2
-17
lines changed

app/wfbngrtl8812/src/main/cpp/WfbngLink.cpp

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ int WfbngLink::run(JNIEnv *env, jobject context, jint wifiChannel, jint bw, jint
117117

118118
rtl_devices.emplace(fd, wifi_driver->CreateRtlDevice(dev_handle));
119119
if (!rtl_devices.at(fd)) {
120+
libusb_exit(ctx);
120121
__android_log_print(ANDROID_LOG_ERROR, TAG, "CreateRtlDevice error");
121122
return -1;
122123
}
@@ -419,23 +420,7 @@ void WfbngLink::start_link_quality_thread(int fd) {
419420
close(sockfd);
420421
return;
421422
}
422-
int sockfd2;
423-
struct sockaddr_in server_addr2;
424-
// Create UDP socket
425-
if ((sockfd2 = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
426-
__android_log_print(ANDROID_LOG_ERROR, TAG, "Socket creation failed");
427-
return;
428-
}
429-
int opt2 = 1;
430-
setsockopt(sockfd2, SOL_SOCKET, SO_REUSEADDR, &opt2, sizeof(opt2));
431-
memset(&server_addr2, 0, sizeof(server_addr2));
432-
server_addr2.sin_family = AF_INET;
433-
server_addr2.sin_port = htons(7755);
434-
if (inet_pton(AF_INET, ip, &server_addr2.sin_addr) <= 0) {
435-
__android_log_print(ANDROID_LOG_ERROR, TAG, "Invalid IP address");
436-
close(sockfd);
437-
return;
438-
}
423+
439424
while (!this->adaptive_link_should_stop) {
440425
auto quality = SignalQualityCalculator::get_instance().calculate_signal_quality();
441426
#if defined(ANDROID_DEBUG_RSSI) || true

0 commit comments

Comments
 (0)