Skip to content
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

fix: use accessors instead of direct access to now-private structures #1

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: use accessors instead of direct access to now-private structures #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 17 additions & 19 deletions http.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,16 @@
* Include necessary headers...
*/

#define _IPP_PRIVATE_STRUCTURES 1

#include <curl/curl.h>
#include <cups/cups.h>
#include <json-c/json.h>
#include <signal.h>
#include <stdio.h>

/*
* Local functions...
*/

/*
* 'generate_request_body()' - Generate request body for webhook...
*/
Expand All @@ -46,26 +44,26 @@
json_object *message_value = json_object_new_string(cupsNotifyText(lang, ipp));
json_object_object_add(request_json, "message", message_value);

for (group = IPP_TAG_ZERO, attr = ipp->attrs; attr; attr = attr->next)
for (group = IPP_TAG_ZERO, attr = ippFirstAttribute(ipp); attr; attr = ippNextAttribute(ipp))
{
if (attr->group_tag == IPP_TAG_ZERO || !attr->name)
if (ippGetGroupTag(attr) == IPP_TAG_ZERO || !ippGetName(attr))
{
group = IPP_TAG_ZERO;
continue;
}

if (group != attr->group_tag)
if (group != ippGetGroupTag(attr))
{
group = attr->group_tag;
group = ippGetGroupTag(attr);

group_json = json_object_new_object();
json_object_object_add(request_json, ippTagString(group), group_json);
}

// Integer, Boolean or Enum
if (attr->value_tag == IPP_TAG_INTEGER ||
attr->value_tag == IPP_TAG_BOOLEAN ||
attr->value_tag == IPP_TAG_ENUM )
if (ippGetValueTag(attr) == IPP_TAG_INTEGER ||
ippGetValueTag(attr) == IPP_TAG_BOOLEAN ||
ippGetValueTag(attr) == IPP_TAG_ENUM )
{
json_value = json_object_new_int(ippGetInteger(attr, 0));
}
Expand All @@ -76,17 +74,17 @@
ippAttributeString(attr, buffer, sizeof(buffer));
json_value = json_object_new_string(buffer);
}
json_object_object_add(group_json, (char *)attr->name, json_value);

json_object_object_add(group_json, (char *)ippGetName(attr), json_value);
}

strcpy(body, json_object_to_json_string(request_json));
}

/*
* 'main()' - Read events and send HTTP notifications.
*/

int /* O - Exit status */
main(int argc, /* I - Number of command-line arguments */
char *argv[]) /* I - Command-line arguments */
Expand All @@ -110,7 +108,7 @@
* Don't buffer stderr...
*/
setbuf(stderr, NULL);

/*
* Ignore SIGPIPE signals...
*/
Expand Down Expand Up @@ -138,15 +136,15 @@

curl = curl_easy_init();


httpAssembleURI(HTTP_URI_CODING_ALL, baseurl, sizeof(baseurl), scheme, NULL, host, port, resource);

headers = curl_slist_append(headers, "Content-Type: application/json");

curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
curl_easy_setopt(curl, CURLOPT_URL, baseurl);
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);

/*
* Loop forever until we run out of events...
*/
Expand All @@ -157,7 +155,7 @@
/*
* Read the next event...
*/

event = ippNew();
while ((state = ippReadFile(0, event)) != IPP_DATA)
{
Expand Down