Skip to content

Add curl option #13

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

Add curl option #13

Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
76d2f02
Put class declaration into header file.
Aug 4, 2024
44d4952
Style: remove invisible ^L characters
Aug 4, 2024
73fbdce
Add curl compilation and runtime option
Aug 6, 2024
e11a8bf
Add curl initialization option.
Aug 7, 2024
377795a
Add record to set CURLOPT_HTTPAUTH
Aug 7, 2024
39d9b34
Add record to set CURLOPT_SSL_VERIFYHOST
Aug 7, 2024
702fc78
Add record for setting CURLOPT_SSL_VERIFYPEER
Aug 7, 2024
308d666
Get rid of unnecessary itemp variable.
Aug 7, 2024
2906040
Add record to set CURLOPT_USERNAME (beware)
Aug 7, 2024
0176dc2
Add record for setting CURLOPT_PASSWORD (beware)
Aug 7, 2024
78d9c2c
Add records to set config filepath
Aug 7, 2024
b9ca193
Add curl file loading functionality
Aug 15, 2024
116434e
Add writeCallback and buffer. Use it on readImage.
Aug 21, 2024
404f5dc
Fix: add needed set of CURLOPT_URL
Aug 21, 2024
8cff152
Style: remove trailing whitespaces.
Aug 21, 2024
d11dec2
Merge branch 'add-config-file' into add-curl-option
Aug 21, 2024
de4f1ad
Add WITH_CURL example in CONFIG_SITE
Aug 21, 2024
32681b4
Merge branch 'add-curl-option'
Aug 21, 2024
b55dc74
Add driver description in ADURL.rst
Aug 22, 2024
1208fb1
Add comments in st_base example file
Aug 22, 2024
2aec6fd
Add comments in code
Aug 22, 2024
01698b2
Merge branch 'documentation' into add-curl-option
Aug 22, 2024
1b1c03f
Merge branch 'add-curl-option'
Aug 22, 2024
dbe0454
Change driver modification/revision numbers
Aug 23, 2024
af80cc7
Update RELEASE with curl modifications
Aug 23, 2024
992a83d
Merge branch 'doc' into add-curl-option
Aug 23, 2024
74aa1a6
Merge branch 'add-curl-option'
Aug 23, 2024
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
Prev Previous commit
Next Next commit
Style: remove trailing whitespaces.
  • Loading branch information
marcofilho committed Aug 21, 2024
commit 8cff1529f857fe044348aa604acfffaab1ecf1dd
22 changes: 11 additions & 11 deletions urlApp/src/URLDriver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ asynStatus URLDriver::readImage()
colorMode = NDColorModeRGB1;
break;
default:
asynPrint(pasynUserSelf, ASYN_TRACE_ERROR,
"%s:%s: unknown ImageType=%d\n",
asynPrint(pasynUserSelf, ASYN_TRACE_ERROR,
"%s:%s: unknown ImageType=%d\n",
driverName, functionName, imageType);
return(asynError);
break;
Expand All @@ -125,8 +125,8 @@ asynStatus URLDriver::readImage()
storageType = IntegerPixel;
break;
default:
asynPrint(pasynUserSelf, ASYN_TRACE_ERROR,
"%s:%s: unsupported depth=%d\n",
asynPrint(pasynUserSelf, ASYN_TRACE_ERROR,
"%s:%s: unsupported depth=%d\n",
driverName, functionName, depth);
return(asynError);
break;
Expand All @@ -136,7 +136,7 @@ asynStatus URLDriver::readImage()
pImage = this->pArrays[0];
asynPrint(this->pasynUserSelf, ASYN_TRACEIO_DRIVER,
"%s:%s: reading URL=%s, dimensions=[%lu,%lu,%lu], ImageType=%d, depth=%d\n",
driverName, functionName, URLString,
driverName, functionName, URLString,
(unsigned long)dims[0], (unsigned long)dims[1], (unsigned long)dims[2], imageType, depth);
image.write(0, 0, ncols, nrows, map, storageType, pImage->pData);
pImage->pAttributeList->add("ColorMode", "Color mode", NDAttrInt32, &colorMode);
Expand All @@ -151,12 +151,12 @@ asynStatus URLDriver::readImage()
}
catch(std::exception &error)
{
asynPrint(this->pasynUserSelf, ASYN_TRACE_ERROR,
"%s:%s: error reading URL=%s\n",
asynPrint(this->pasynUserSelf, ASYN_TRACE_ERROR,
"%s:%s: error reading URL=%s\n",
driverName, functionName, error.what());
return(asynError);
}

return(asynSuccess);
}

Expand Down Expand Up @@ -547,7 +547,7 @@ void URLDriver::report(FILE *fp, int details)
* \param[in] priority The thread priority for the asyn port driver thread if ASYN_CANBLOCK is set in asynFlags.
* \param[in] stackSize The stack size for the asyn port driver thread if ASYN_CANBLOCK is set in asynFlags.
*/
URLDriver::URLDriver(const char *portName, int maxBuffers, size_t maxMemory,
URLDriver::URLDriver(const char *portName, int maxBuffers, size_t maxMemory,
int priority, int stackSize)

: ADDriver(portName, 1, 0, maxBuffers, maxMemory,
Expand Down Expand Up @@ -601,7 +601,7 @@ URLDriver::URLDriver(const char *portName, int maxBuffers, size_t maxMemory,
/* Set some default values for parameters */
status = setStringParam (ADManufacturer, "URL Driver");
status |= setStringParam (ADModel, "GraphicsMagick");
epicsSnprintf(versionString, sizeof(versionString), "%d.%d.%d",
epicsSnprintf(versionString, sizeof(versionString), "%d.%d.%d",
DRIVER_VERSION, DRIVER_REVISION, DRIVER_MODIFICATION);
setStringParam(NDDriverVersion, versionString);
setStringParam(ADSDKVersion, MagickLibVersionText);
Expand All @@ -626,7 +626,7 @@ URLDriver::URLDriver(const char *portName, int maxBuffers, size_t maxMemory,
}

/** Configuration command, called directly or from iocsh */
extern "C" int URLDriverConfig(const char *portName, int maxBuffers, size_t maxMemory,
extern "C" int URLDriverConfig(const char *portName, int maxBuffers, size_t maxMemory,
int priority, int stackSize)
{
/* Initialize GraphicsMagick */
Expand Down