Skip to content

Fix multi interface #31

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

Fix multi interface #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d52de11
fix multi interface parameters
Feb 18, 2025
736e614
Merge branch 'flightaware:master' into fix-multi
stephanm Feb 19, 2025
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
24 changes: 12 additions & 12 deletions generic/multi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,12 +167,12 @@ curlMultiObjCmd (ClientData clientData, Tcl_Interp *interp,
switch(tableIndex) {
case 0:
/* fprintf(stdout,"Multi add handle\n"); */
errorCode=curlAddMultiHandle(interp,curlMultiData->mcurl,objv[2]);
errorCode=curlAddMultiHandle(interp,curlMultiData,objv[2]);
return curlReturnCURLMcode(interp,errorCode);
break;
case 1:
/* fprintf(stdout,"Multi remove handle\n"); */
errorCode=curlRemoveMultiHandle(interp,curlMultiData->mcurl,objv[2]);
errorCode=curlRemoveMultiHandle(interp,curlMultiData,objv[2]);
return curlReturnCURLMcode(interp,errorCode);
break;
case 2:
Expand All @@ -186,7 +186,7 @@ curlMultiObjCmd (ClientData clientData, Tcl_Interp *interp,
break;
case 4:
/* fprintf(stdout,"Multi getInfo\n"); */
curlMultiGetInfo(interp,curlMultiData->mcurl);
curlMultiGetInfo(interp,curlMultiData);
break;
case 5:
/* fprintf(stdout,"Multi activeTransfers\n"); */
Expand Down Expand Up @@ -222,7 +222,7 @@ curlMultiObjCmd (ClientData clientData, Tcl_Interp *interp,
*----------------------------------------------------------------------
*/
CURLMcode
curlAddMultiHandle(Tcl_Interp *interp,CURLM *curlMultiHandlePtr
curlAddMultiHandle(Tcl_Interp *interp,struct curlMultiObjData *multiDataPtr
,Tcl_Obj *objvPtr) {

struct curlObjData *curlDataPtr;
Expand All @@ -238,9 +238,9 @@ curlAddMultiHandle(Tcl_Interp *interp,CURLM *curlMultiHandlePtr
return TCL_ERROR;
}

errorCode=curl_multi_add_handle(curlMultiHandlePtr,curlDataPtr->curl);
errorCode=curl_multi_add_handle(multiDataPtr->mcurl,curlDataPtr->curl);

curlEasyHandleListAdd(curlMultiHandlePtr,curlDataPtr->curl
curlEasyHandleListAdd(multiDataPtr,curlDataPtr->curl
,Tcl_GetString(objvPtr));

return errorCode;
Expand All @@ -264,14 +264,14 @@ curlAddMultiHandle(Tcl_Interp *interp,CURLM *curlMultiHandlePtr
*----------------------------------------------------------------------
*/
CURLMcode
curlRemoveMultiHandle(Tcl_Interp *interp,CURLM *curlMultiHandle
curlRemoveMultiHandle(Tcl_Interp *interp,struct curlMultiObjData *multiDataPtr
,Tcl_Obj *objvPtr) {
struct curlObjData *curlDataPtr;
CURLMcode errorCode;

curlDataPtr=curlGetEasyHandle(interp,objvPtr);
errorCode=curl_multi_remove_handle(curlMultiHandle,curlDataPtr->curl);
curlEasyHandleListRemove(curlMultiHandle,curlDataPtr->curl);
errorCode=curl_multi_remove_handle(multiDataPtr->mcurl,curlDataPtr->curl);
curlEasyHandleListRemove(multiDataPtr,curlDataPtr->curl);

curlCloseFiles(curlDataPtr);
curlResetPostData(curlDataPtr);
Expand Down Expand Up @@ -374,12 +374,12 @@ curlMultiDeleteCmd(ClientData clientData) {
*----------------------------------------------------------------------
*/
int
curlMultiGetInfo(Tcl_Interp *interp,CURLM *curlMultiHandlePtr) {
curlMultiGetInfo(Tcl_Interp *interp,struct curlMultiObjData *multiDataPtr) {
struct CURLMsg *multiInfo;
int msgLeft;
Tcl_Obj *resultPtr;

multiInfo=curl_multi_info_read(curlMultiHandlePtr, &msgLeft);
multiInfo=curl_multi_info_read(multiDataPtr->mcurl, &msgLeft);
resultPtr=Tcl_NewListObj(0,(Tcl_Obj **)NULL);
if (multiInfo==NULL) {
Tcl_ListObjAppendElement(interp,resultPtr,Tcl_NewStringObj("",-1));
Expand All @@ -388,7 +388,7 @@ curlMultiGetInfo(Tcl_Interp *interp,CURLM *curlMultiHandlePtr) {
Tcl_ListObjAppendElement(interp,resultPtr,Tcl_NewIntObj(0));
} else {
Tcl_ListObjAppendElement(interp,resultPtr,
Tcl_NewStringObj(curlGetEasyName(curlMultiHandlePtr,multiInfo->easy_handle),-1));
Tcl_NewStringObj(curlGetEasyName(multiDataPtr,multiInfo->easy_handle),-1));
Tcl_ListObjAppendElement(interp,resultPtr,Tcl_NewIntObj(multiInfo->msg));
Tcl_ListObjAppendElement(interp,resultPtr,Tcl_NewIntObj(multiInfo->data.result));
Tcl_ListObjAppendElement(interp,resultPtr,Tcl_NewIntObj(msgLeft));
Expand Down
6 changes: 3 additions & 3 deletions generic/multi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,15 @@ int curlInitMultiObjCmd (ClientData clientData, Tcl_Interp *interp,
int curlMultiObjCmd (ClientData clientData, Tcl_Interp *interp,
int objc,Tcl_Obj *const objv[]);

CURLMcode curlAddMultiHandle(Tcl_Interp *interp,CURLM *curlMultiHandle
CURLMcode curlAddMultiHandle(Tcl_Interp *interp,struct curlMultiObjData *multiDataPtr
,Tcl_Obj *objvPtr);

CURLMcode curlRemoveMultiHandle(Tcl_Interp *interp,CURLM *curlMultiHandle
CURLMcode curlRemoveMultiHandle(Tcl_Interp *interp,struct curlMultiObjData *multiDataPtr
,Tcl_Obj *objvPtr);

int curlMultiPerform(Tcl_Interp *interp,CURLM *curlMultiHandle);

int curlMultiGetInfo(Tcl_Interp *interp,CURLM *curlMultiHandlePtr);
int curlMultiGetInfo(Tcl_Interp *interp,struct curlMultiObjData *multiDataPtr);

int curlMultiGetActiveTransfers( struct curlMultiObjData *curlMultiData);
int curlMultiActiveTransfers(Tcl_Interp *interp, struct curlMultiObjData *curlMultiData);
Expand Down
Loading